diff --git a/Sources/FirebladeECS/Nexus.swift b/Sources/FirebladeECS/Nexus.swift
index 1b4fdde..e44830d 100644
--- a/Sources/FirebladeECS/Nexus.swift
+++ b/Sources/FirebladeECS/Nexus.swift
@@ -5,21 +5,6 @@
 //  Created by Christian Treffs on 09.10.17.
 //
 
-/// entity id ^ component identifier hash
-public typealias EntityComponentHash = Int
-public typealias ComponentIdsByEntityIndex = Int
-public typealias ComponentTypeHash = Int // component object identifier hash value
-public typealias UniformComponents = ManagedContiguousArray<Component>
-public typealias UniformEntityIdentifiers = UnorderedSparseSet<EntityIdentifier>
-public typealias ComponentIdentifiers = ContiguousArray<ComponentIdentifier>
-public typealias ComponentSet = Set<ComponentIdentifier>
-public typealias Entities = UnorderedSparseSet<Entity>
-public typealias EntityIdSet = Set<EntityIdentifier>
-public typealias FamilyTraitSetHash = Int
-public typealias TraitEntityIdHash = Int
-public typealias EntityIdInFamilyIndex = Int
-public typealias TraitEntityIdHashSet = [TraitEntityIdHash: EntityIdInFamilyIndex]
-
 public protocol NexusDelegate: class {
     func nexusEventOccurred(_ event: ECSEvent)
     func nexusRecoverableErrorOccurred(_ message: String)
diff --git a/Sources/FirebladeECS/Typealiases.swift b/Sources/FirebladeECS/Typealiases.swift
new file mode 100644
index 0000000..d953b4a
--- /dev/null
+++ b/Sources/FirebladeECS/Typealiases.swift
@@ -0,0 +1,21 @@
+//
+//  Typealiases.swift
+//  
+//
+//  Created by Christian Treffs on 20.08.19.
+//
+
+/// entity id ^ component identifier hash
+public typealias EntityComponentHash = Int
+public typealias ComponentIdsByEntityIndex = Int
+public typealias ComponentTypeHash = Int // component object identifier hash value
+public typealias UniformComponents = ManagedContiguousArray<Component>
+public typealias UniformEntityIdentifiers = UnorderedSparseSet<EntityIdentifier>
+public typealias ComponentIdentifiers = ContiguousArray<ComponentIdentifier>
+public typealias ComponentSet = Set<ComponentIdentifier>
+public typealias Entities = UnorderedSparseSet<Entity>
+public typealias EntityIdSet = Set<EntityIdentifier>
+public typealias FamilyTraitSetHash = Int
+public typealias TraitEntityIdHash = Int
+public typealias EntityIdInFamilyIndex = Int
+public typealias TraitEntityIdHashSet = [TraitEntityIdHash: EntityIdInFamilyIndex]