diff --git a/Common/Database/Model/Delta.xcdatamodeld/Model.xcdatamodel/contents b/Common/Database/Model/Delta.xcdatamodeld/Model.xcdatamodel/contents
deleted file mode 100644
index 62b6475..0000000
--- a/Common/Database/Model/Delta.xcdatamodeld/Model.xcdatamodel/contents
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="11542" systemVersion="16B2555" minimumToolsVersion="Xcode 7.0" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="1.0">
-    <entity name="Cheat" representedClassName="Cheat" syncable="YES">
-        <attribute name="code" attributeType="String" syncable="YES"/>
-        <attribute name="creationDate" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="identifier" attributeType="String" syncable="YES"/>
-        <attribute name="isEnabled" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="modifiedDate" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
-        <attribute name="type" attributeType="Transformable" syncable="YES">
-            <userInfo>
-                <entry key="attributeValueClassName" value="CheatType"/>
-            </userInfo>
-        </attribute>
-        <relationship name="game" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Game" inverseName="cheats" inverseEntity="Game" syncable="YES"/>
-        <uniquenessConstraints>
-            <uniquenessConstraint>
-                <constraint value="identifier"/>
-            </uniquenessConstraint>
-        </uniquenessConstraints>
-    </entity>
-    <entity name="ControllerSkin" representedClassName="ControllerSkin" syncable="YES">
-        <attribute name="filename" attributeType="String" syncable="YES"/>
-        <attribute name="gameType" attributeType="Transformable" syncable="YES">
-            <userInfo>
-                <entry key="attributeValueClassName" value="GameType"/>
-            </userInfo>
-        </attribute>
-        <attribute name="identifier" attributeType="String" syncable="YES"/>
-        <attribute name="isStandard" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
-        <attribute name="name" attributeType="String" syncable="YES"/>
-        <attribute name="supportedConfigurations" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES" syncable="YES">
-            <userInfo>
-                <entry key="attributeValueScalarType" value="ControllerSkinConfigurations"/>
-            </userInfo>
-        </attribute>
-        <uniquenessConstraints>
-            <uniquenessConstraint>
-                <constraint value="identifier"/>
-                <constraint value="gameType"/>
-            </uniquenessConstraint>
-        </uniquenessConstraints>
-    </entity>
-    <entity name="Game" representedClassName="Game" syncable="YES">
-        <attribute name="artworkURL" optional="YES" attributeType="Transformable" syncable="YES">
-            <userInfo>
-                <entry key="attributeValueClassName" value="URL"/>
-            </userInfo>
-        </attribute>
-        <attribute name="filename" attributeType="String" syncable="YES">
-            <userInfo>
-                <entry key="attributeValueClassName" value="NSURL"/>
-            </userInfo>
-        </attribute>
-        <attribute name="identifier" attributeType="String" syncable="YES"/>
-        <attribute name="name" attributeType="String" syncable="YES"/>
-        <attribute name="type" attributeType="Transformable" syncable="YES">
-            <userInfo>
-                <entry key="attributeValueClassName" value="GameType"/>
-            </userInfo>
-        </attribute>
-        <relationship name="cheats" toMany="YES" deletionRule="Cascade" destinationEntity="Cheat" inverseName="game" inverseEntity="Cheat" syncable="YES"/>
-        <relationship name="gameCollections" toMany="YES" deletionRule="Nullify" destinationEntity="GameCollection" inverseName="games" inverseEntity="GameCollection" syncable="YES"/>
-        <relationship name="previewSaveState" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="SaveState" inverseName="previewGame" inverseEntity="SaveState" syncable="YES"/>
-        <relationship name="saveStates" toMany="YES" deletionRule="Cascade" destinationEntity="SaveState" inverseName="game" inverseEntity="SaveState" syncable="YES"/>
-        <uniquenessConstraints>
-            <uniquenessConstraint>
-                <constraint value="identifier"/>
-            </uniquenessConstraint>
-        </uniquenessConstraints>
-    </entity>
-    <entity name="GameCollection" representedClassName="GameCollection" syncable="YES">
-        <attribute name="identifier" attributeType="String" syncable="YES"/>
-        <attribute name="index" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
-        <relationship name="games" toMany="YES" deletionRule="Nullify" destinationEntity="Game" inverseName="gameCollections" inverseEntity="Game" syncable="YES"/>
-        <uniquenessConstraints>
-            <uniquenessConstraint>
-                <constraint value="identifier"/>
-            </uniquenessConstraint>
-        </uniquenessConstraints>
-    </entity>
-    <entity name="SaveState" representedClassName="SaveState" syncable="YES">
-        <attribute name="creationDate" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="filename" attributeType="String" syncable="YES">
-            <userInfo>
-                <entry key="attributeValueClassName" value="NSURL"/>
-            </userInfo>
-        </attribute>
-        <attribute name="identifier" attributeType="String" syncable="YES"/>
-        <attribute name="modifiedDate" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
-        <attribute name="type" attributeType="Integer 16" defaultValueString="1" usesScalarValueType="NO" syncable="YES">
-            <userInfo>
-                <entry key="attributeValueScalarType" value="SaveStateType"/>
-            </userInfo>
-        </attribute>
-        <relationship name="game" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Game" inverseName="saveStates" inverseEntity="Game" syncable="YES"/>
-        <relationship name="previewGame" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Game" inverseName="previewSaveState" inverseEntity="Game" syncable="YES"/>
-        <uniquenessConstraints>
-            <uniquenessConstraint>
-                <constraint value="identifier"/>
-            </uniquenessConstraint>
-        </uniquenessConstraints>
-    </entity>
-    <elements>
-        <element name="Cheat" positionX="-198" positionY="-63" width="128" height="165"/>
-        <element name="ControllerSkin" positionX="-387" positionY="90" width="128" height="135"/>
-        <element name="Game" positionX="-378" positionY="-54" width="128" height="180"/>
-        <element name="GameCollection" positionX="-585" positionY="-27" width="128" height="90"/>
-        <element name="SaveState" positionX="-198" positionY="113" width="128" height="165"/>
-    </elements>
-</model>
\ No newline at end of file
diff --git a/Delta.xcodeproj/project.pbxproj b/Delta.xcodeproj/project.pbxproj
index 1a26bf4..dafb3cd 100644
--- a/Delta.xcodeproj/project.pbxproj
+++ b/Delta.xcodeproj/project.pbxproj
@@ -681,7 +681,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/usr/local/bin/mogenerator -m \"Common/Database/Model/Delta.xcdatamodeld\" -O \"Common/Database/Model\" --swift --template-var scalarsWhenNonOptional=true --template-path \"Common/Database/Model/mogenerator/templates\"";
+			shellScript = "/usr/local/bin/mogenerator -m \"Delta/Database/Model/Model.xcdatamodel\" --human-dir \"Delta/Database/Model/Human\" --machine-dir \"Delta/Database/Model/Machine\" --swift --template-var scalarsWhenNonOptional=true --template-path \"Delta/Database/Model/mogenerator/templates\"";
 		};
 		DBD91E7D7EC2729786B4C5B1 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
diff --git a/Delta/Database/Model/Model.xcdatamodel/contents b/Delta/Database/Model/Model.xcdatamodel/contents
index 62b6475..b009f69 100644
--- a/Delta/Database/Model/Model.xcdatamodel/contents
+++ b/Delta/Database/Model/Model.xcdatamodel/contents
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="11542" systemVersion="16B2555" minimumToolsVersion="Xcode 7.0" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="1.0">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="11759" systemVersion="16C68" minimumToolsVersion="Xcode 7.0" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="1.0">
     <entity name="Cheat" representedClassName="Cheat" syncable="YES">
         <attribute name="code" attributeType="String" syncable="YES"/>
         <attribute name="creationDate" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
diff --git a/Common/Database/Model/mogenerator/templates/human.swift.motemplate b/Delta/Database/Model/mogenerator/templates/human.swift.motemplate
similarity index 100%
rename from Common/Database/Model/mogenerator/templates/human.swift.motemplate
rename to Delta/Database/Model/mogenerator/templates/human.swift.motemplate
diff --git a/Common/Database/Model/mogenerator/templates/machine.swift.motemplate b/Delta/Database/Model/mogenerator/templates/machine.swift.motemplate
similarity index 100%
rename from Common/Database/Model/mogenerator/templates/machine.swift.motemplate
rename to Delta/Database/Model/mogenerator/templates/machine.swift.motemplate