diff --git a/interface/definition b/interface/definition
index a89b238b9..9220a9a0e 100644
--- a/interface/definition
+++ b/interface/definition
@@ -1,10 +1,3 @@
-Source
-	packages : Package*
-	definitions: Definition*
-
-Package
-	name: String
-
 Definition
 	name: String
 	access: Access
@@ -29,91 +22,3 @@ Definition
 			TypeDeclaration
 				lowerBound: Type
 				upperBound: Type
-
-Type
-	SimpleType
-		Projection
-			prefix : SimpleType
-			id : String
-		ParameterRef
-			id: Int
-		Singleton
-			path: Path
-		EmptyType
-		Parameterized
-			baseType : SimpleType
-			typeArguments: Type*
-	Annotated
-		baseType : SimpleType
-		annotations : Annotation*
-	Structure
-		parents : Type*
-		declarations: Definition*
-		inherited: Definition*
-	Existential
-		baseType : Type
-		clause: TypeParameter*
-	Polymorphic
-		baseType: Type
-		parameters: TypeParameter*
-
-Access
-	Public
-	Qualified
-		qualifier: Qualifier
-		Protected
-		Private
-		Pkg
-
-Qualifier
-	Unqualified
-	ThisQualifier
-	IdQualifier
-		value: String
-
-Modifiers
-	isAbstract: Boolean
-	isDeferred: Boolean
-	isOverride: Boolean
-	isFinal: Boolean
-	isSealed: Boolean
-	isImplicit: Boolean
-	isLazy: Boolean
-	isSynthetic: Boolean
-
-ParameterList
-	parameters: MethodParameter*
-	isImplicit: Boolean
-MethodParameter
-	name: String
-	tpe: Type
-	hasDefault: Boolean
-	modifier: ParameterModifier
-
-TypeParameter
-	id: Int
-	typeParameters : TypeParameter*
-	variance: Variance
-	lowerBound: Type
-	upperBound: Type
-
-Annotation
-	base: SimpleType
-	arguments: AnnotationArgument*
-AnnotationArgument
-	name: String
-	value: String
-
-enum Variance : Contravariant, Covariant, Invariant
-enum ParameterModifier : Repeated, Plain, ByName
-enum DefinitionType : Trait, ClassDef, Module, PackageModule
-
-Path
-	components: PathComponent*
-
-PathComponent
-	Super
-		qualifier: Path
-	This
-	Id
-		id: String
\ No newline at end of file
diff --git a/interface/other b/interface/other
new file mode 100644
index 000000000..78fe98691
--- /dev/null
+++ b/interface/other
@@ -0,0 +1,68 @@
+Source
+	packages : Package*
+	definitions: Definition*
+
+Package
+	name: String
+
+Access
+	Public
+	Qualified
+		qualifier: Qualifier
+		Protected
+		Private
+		Pkg
+
+Qualifier
+	Unqualified
+	ThisQualifier
+	IdQualifier
+		value: String
+
+Modifiers
+	isAbstract: Boolean
+	isDeferred: Boolean
+	isOverride: Boolean
+	isFinal: Boolean
+	isSealed: Boolean
+	isImplicit: Boolean
+	isLazy: Boolean
+	isSynthetic: Boolean
+
+ParameterList
+	parameters: MethodParameter*
+	isImplicit: Boolean
+MethodParameter
+	name: String
+	tpe: Type
+	hasDefault: Boolean
+	modifier: ParameterModifier
+
+TypeParameter
+	id: Int
+	annotations: Annotation*
+	typeParameters : TypeParameter*
+	variance: Variance
+	lowerBound: Type
+	upperBound: Type
+
+Annotation
+	base: SimpleType
+	arguments: AnnotationArgument*
+AnnotationArgument
+	name: String
+	value: String
+
+enum Variance : Contravariant, Covariant, Invariant
+enum ParameterModifier : Repeated, Plain, ByName
+enum DefinitionType : Trait, ClassDef, Module, PackageModule
+
+Path
+	components: PathComponent*
+
+PathComponent
+	Super
+		qualifier: Path
+	This
+	Id
+		id: String
\ No newline at end of file
diff --git a/interface/type b/interface/type
new file mode 100644
index 000000000..c516b62b9
--- /dev/null
+++ b/interface/type
@@ -0,0 +1,27 @@
+
+Type
+	SimpleType
+		Projection
+			prefix : SimpleType
+			id : String
+		ParameterRef
+			id: Int
+		Singleton
+			path: Path
+		EmptyType
+		Parameterized
+			baseType : SimpleType
+			typeArguments: Type*
+	Annotated
+		baseType : SimpleType
+		annotations : Annotation*
+	Structure
+		parents : Type*
+		declared: Definition*
+		inherited: Definition*
+	Existential
+		baseType : Type
+		clause: TypeParameter*
+	Polymorphic
+		baseType: Type
+		parameters: TypeParameter*