diff --git a/AssetRipperCore/AssetRipperCore.csproj b/AssetRipper.Core/AssetRipper.Core.csproj
similarity index 94%
rename from AssetRipperCore/AssetRipperCore.csproj
rename to AssetRipper.Core/AssetRipper.Core.csproj
index 2bd070a1f..be26b290e 100644
--- a/AssetRipperCore/AssetRipperCore.csproj
+++ b/AssetRipper.Core/AssetRipper.Core.csproj
@@ -28,10 +28,6 @@
 		<RuntimeHostConfigurationOption Include="System.Globalization.Invariant" Value="true" />
 	</ItemGroup>
 
-	<ItemGroup>
-		<ProjectReference Include="..\AssetRipperCommon\AssetRipperCommon.csproj" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<Reference Include="AssetRipper.SourceGenerated">
 			<SpecificVersion>False</SpecificVersion>
@@ -45,4 +41,8 @@
 		<None Remove="obj\**" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <ProjectReference Include="..\AssetRipper.Fundamentals\AssetRipper.Fundamentals.csproj" />
+	</ItemGroup>
+
 </Project>
diff --git a/AssetRipperCommon/Classes/Animation/AnimationCullingType.cs b/AssetRipper.Core/Classes/Animation/AnimationCullingType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Animation/AnimationCullingType.cs
rename to AssetRipper.Core/Classes/Animation/AnimationCullingType.cs
diff --git a/AssetRipperCommon/Classes/AnimationClip/AnimationType.cs b/AssetRipper.Core/Classes/AnimationClip/AnimationType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/AnimationClip/AnimationType.cs
rename to AssetRipper.Core/Classes/AnimationClip/AnimationType.cs
diff --git a/AssetRipperCommon/Classes/AnimationClip/GenericBinding/BindingCustomType.cs b/AssetRipper.Core/Classes/AnimationClip/GenericBinding/BindingCustomType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/AnimationClip/GenericBinding/BindingCustomType.cs
rename to AssetRipper.Core/Classes/AnimationClip/GenericBinding/BindingCustomType.cs
diff --git a/AssetRipperCommon/Classes/AnimationClip/GenericBinding/TransformType.cs b/AssetRipper.Core/Classes/AnimationClip/GenericBinding/TransformType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/AnimationClip/GenericBinding/TransformType.cs
rename to AssetRipper.Core/Classes/AnimationClip/GenericBinding/TransformType.cs
diff --git a/AssetRipperCommon/Classes/AnimationClip/HumanoidMuscleType.cs b/AssetRipper.Core/Classes/AnimationClip/HumanoidMuscleType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/AnimationClip/HumanoidMuscleType.cs
rename to AssetRipper.Core/Classes/AnimationClip/HumanoidMuscleType.cs
diff --git a/AssetRipperCommon/Classes/AnimationClip/WrapMode.cs b/AssetRipper.Core/Classes/AnimationClip/WrapMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/AnimationClip/WrapMode.cs
rename to AssetRipper.Core/Classes/AnimationClip/WrapMode.cs
diff --git a/AssetRipperCommon/Classes/Animator/AnimatorCullingMode.cs b/AssetRipper.Core/Classes/Animator/AnimatorCullingMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Animator/AnimatorCullingMode.cs
rename to AssetRipper.Core/Classes/Animator/AnimatorCullingMode.cs
diff --git a/AssetRipperCommon/Classes/Animator/AnimatorUpdateMode.cs b/AssetRipper.Core/Classes/Animator/AnimatorUpdateMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Animator/AnimatorUpdateMode.cs
rename to AssetRipper.Core/Classes/Animator/AnimatorUpdateMode.cs
diff --git a/AssetRipperCommon/Classes/AnimatorController/Constants/IBlend1dDataConstant.cs b/AssetRipper.Core/Classes/AnimatorController/Constants/IBlend1dDataConstant.cs
similarity index 100%
rename from AssetRipperCommon/Classes/AnimatorController/Constants/IBlend1dDataConstant.cs
rename to AssetRipper.Core/Classes/AnimatorController/Constants/IBlend1dDataConstant.cs
diff --git a/AssetRipperCommon/Classes/AnimatorController/Constants/TransitionInterruptionSource.cs b/AssetRipper.Core/Classes/AnimatorController/Constants/TransitionInterruptionSource.cs
similarity index 100%
rename from AssetRipperCommon/Classes/AnimatorController/Constants/TransitionInterruptionSource.cs
rename to AssetRipper.Core/Classes/AnimatorController/Constants/TransitionInterruptionSource.cs
diff --git a/AssetRipperCommon/Classes/AnimatorController/Editor/AnimatorControllerLayer/AnimatorLayerBlendingMode.cs b/AssetRipper.Core/Classes/AnimatorController/Editor/AnimatorControllerLayer/AnimatorLayerBlendingMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/AnimatorController/Editor/AnimatorControllerLayer/AnimatorLayerBlendingMode.cs
rename to AssetRipper.Core/Classes/AnimatorController/Editor/AnimatorControllerLayer/AnimatorLayerBlendingMode.cs
diff --git a/AssetRipperCommon/Classes/AnimatorController/Editor/AnimatorControllerParameter/AnimatorControllerParameterType.cs b/AssetRipper.Core/Classes/AnimatorController/Editor/AnimatorControllerParameter/AnimatorControllerParameterType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/AnimatorController/Editor/AnimatorControllerParameter/AnimatorControllerParameterType.cs
rename to AssetRipper.Core/Classes/AnimatorController/Editor/AnimatorControllerParameter/AnimatorControllerParameterType.cs
diff --git a/AssetRipperCommon/Classes/AnimatorTransition/AnimatorConditionMode.cs b/AssetRipper.Core/Classes/AnimatorTransition/AnimatorConditionMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/AnimatorTransition/AnimatorConditionMode.cs
rename to AssetRipper.Core/Classes/AnimatorTransition/AnimatorConditionMode.cs
diff --git a/AssetRipperCommon/Classes/AudioClip/AudioClipLoadType.cs b/AssetRipper.Core/Classes/AudioClip/AudioClipLoadType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/AudioClip/AudioClipLoadType.cs
rename to AssetRipper.Core/Classes/AudioClip/AudioClipLoadType.cs
diff --git a/AssetRipperCommon/Classes/AudioClip/AudioCompressionFormat.cs b/AssetRipper.Core/Classes/AudioClip/AudioCompressionFormat.cs
similarity index 100%
rename from AssetRipperCommon/Classes/AudioClip/AudioCompressionFormat.cs
rename to AssetRipper.Core/Classes/AudioClip/AudioCompressionFormat.cs
diff --git a/AssetRipperCommon/Classes/AudioClip/AudioType.cs b/AssetRipper.Core/Classes/AudioClip/AudioType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/AudioClip/AudioType.cs
rename to AssetRipper.Core/Classes/AudioClip/AudioType.cs
diff --git a/AssetRipperCommon/Classes/AudioClip/FMODSoundFormat.cs b/AssetRipper.Core/Classes/AudioClip/FMODSoundFormat.cs
similarity index 100%
rename from AssetRipperCommon/Classes/AudioClip/FMODSoundFormat.cs
rename to AssetRipper.Core/Classes/AudioClip/FMODSoundFormat.cs
diff --git a/AssetRipperCommon/Classes/AudioClip/FMODSoundType.cs b/AssetRipper.Core/Classes/AudioClip/FMODSoundType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/AudioClip/FMODSoundType.cs
rename to AssetRipper.Core/Classes/AudioClip/FMODSoundType.cs
diff --git a/AssetRipperCommon/Classes/AudioManager/AudioSpeakerMode.cs b/AssetRipper.Core/Classes/AudioManager/AudioSpeakerMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/AudioManager/AudioSpeakerMode.cs
rename to AssetRipper.Core/Classes/AudioManager/AudioSpeakerMode.cs
diff --git a/AssetRipperCommon/Classes/AudioReverbFilter/AudioReverbPreset.cs b/AssetRipper.Core/Classes/AudioReverbFilter/AudioReverbPreset.cs
similarity index 100%
rename from AssetRipperCommon/Classes/AudioReverbFilter/AudioReverbPreset.cs
rename to AssetRipper.Core/Classes/AudioReverbFilter/AudioReverbPreset.cs
diff --git a/AssetRipperCommon/Classes/AudioSource/AudioRolloffMode.cs b/AssetRipper.Core/Classes/AudioSource/AudioRolloffMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/AudioSource/AudioRolloffMode.cs
rename to AssetRipper.Core/Classes/AudioSource/AudioRolloffMode.cs
diff --git a/AssetRipperCommon/Classes/Avatar/BodyDoF.cs b/AssetRipper.Core/Classes/Avatar/BodyDoF.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Avatar/BodyDoF.cs
rename to AssetRipper.Core/Classes/Avatar/BodyDoF.cs
diff --git a/AssetRipperCommon/Classes/BlendTree/BlendTreeType.cs b/AssetRipper.Core/Classes/BlendTree/BlendTreeType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/BlendTree/BlendTreeType.cs
rename to AssetRipper.Core/Classes/BlendTree/BlendTreeType.cs
diff --git a/AssetRipperCommon/Classes/Camera/FieldOfViewAxis.cs b/AssetRipper.Core/Classes/Camera/FieldOfViewAxis.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Camera/FieldOfViewAxis.cs
rename to AssetRipper.Core/Classes/Camera/FieldOfViewAxis.cs
diff --git a/AssetRipperCommon/Classes/Camera/GateFitMode.cs b/AssetRipper.Core/Classes/Camera/GateFitMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Camera/GateFitMode.cs
rename to AssetRipper.Core/Classes/Camera/GateFitMode.cs
diff --git a/AssetRipperCommon/Classes/Camera/ProjectionMatrixMode.cs b/AssetRipper.Core/Classes/Camera/ProjectionMatrixMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Camera/ProjectionMatrixMode.cs
rename to AssetRipper.Core/Classes/Camera/ProjectionMatrixMode.cs
diff --git a/AssetRipperCommon/Classes/Camera/RenderingPath.cs b/AssetRipper.Core/Classes/Camera/RenderingPath.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Camera/RenderingPath.cs
rename to AssetRipper.Core/Classes/Camera/RenderingPath.cs
diff --git a/AssetRipperCommon/Classes/Camera/StereoTargetEyeMask.cs b/AssetRipper.Core/Classes/Camera/StereoTargetEyeMask.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Camera/StereoTargetEyeMask.cs
rename to AssetRipper.Core/Classes/Camera/StereoTargetEyeMask.cs
diff --git a/AssetRipperCommon/Classes/CapsuleCollider2D/CapsuleDirection2D.cs b/AssetRipper.Core/Classes/CapsuleCollider2D/CapsuleDirection2D.cs
similarity index 100%
rename from AssetRipperCommon/Classes/CapsuleCollider2D/CapsuleDirection2D.cs
rename to AssetRipper.Core/Classes/CapsuleCollider2D/CapsuleDirection2D.cs
diff --git a/AssetRipperCommon/Classes/ClusterInputManager/ClusterInputType.cs b/AssetRipper.Core/Classes/ClusterInputManager/ClusterInputType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/ClusterInputManager/ClusterInputType.cs
rename to AssetRipper.Core/Classes/ClusterInputManager/ClusterInputType.cs
diff --git a/AssetRipperCommon/Classes/CompositeCollider2D/GenerationType.cs b/AssetRipper.Core/Classes/CompositeCollider2D/GenerationType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/CompositeCollider2D/GenerationType.cs
rename to AssetRipper.Core/Classes/CompositeCollider2D/GenerationType.cs
diff --git a/AssetRipperCommon/Classes/CompositeCollider2D/GeometryType.cs b/AssetRipper.Core/Classes/CompositeCollider2D/GeometryType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/CompositeCollider2D/GeometryType.cs
rename to AssetRipper.Core/Classes/CompositeCollider2D/GeometryType.cs
diff --git a/AssetRipperCommon/Classes/EditorSettings/AssetPipelineMode.cs b/AssetRipper.Core/Classes/EditorSettings/AssetPipelineMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/EditorSettings/AssetPipelineMode.cs
rename to AssetRipper.Core/Classes/EditorSettings/AssetPipelineMode.cs
diff --git a/AssetRipperCommon/Classes/EditorSettings/CacheServerMode.cs b/AssetRipper.Core/Classes/EditorSettings/CacheServerMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/EditorSettings/CacheServerMode.cs
rename to AssetRipper.Core/Classes/EditorSettings/CacheServerMode.cs
diff --git a/AssetRipperCommon/Classes/EditorSettings/EditorBehaviorMode.cs b/AssetRipper.Core/Classes/EditorSettings/EditorBehaviorMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/EditorSettings/EditorBehaviorMode.cs
rename to AssetRipper.Core/Classes/EditorSettings/EditorBehaviorMode.cs
diff --git a/AssetRipperCommon/Classes/EditorSettings/EnterPlayModeOptions.cs b/AssetRipper.Core/Classes/EditorSettings/EnterPlayModeOptions.cs
similarity index 100%
rename from AssetRipperCommon/Classes/EditorSettings/EnterPlayModeOptions.cs
rename to AssetRipper.Core/Classes/EditorSettings/EnterPlayModeOptions.cs
diff --git a/AssetRipperCommon/Classes/EditorSettings/ExternalVersionControl.cs b/AssetRipper.Core/Classes/EditorSettings/ExternalVersionControl.cs
similarity index 100%
rename from AssetRipperCommon/Classes/EditorSettings/ExternalVersionControl.cs
rename to AssetRipper.Core/Classes/EditorSettings/ExternalVersionControl.cs
diff --git a/AssetRipperCommon/Classes/EditorSettings/LineEndingsMode.cs b/AssetRipper.Core/Classes/EditorSettings/LineEndingsMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/EditorSettings/LineEndingsMode.cs
rename to AssetRipper.Core/Classes/EditorSettings/LineEndingsMode.cs
diff --git a/AssetRipperCommon/Classes/EditorSettings/SerializationMode.cs b/AssetRipper.Core/Classes/EditorSettings/SerializationMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/EditorSettings/SerializationMode.cs
rename to AssetRipper.Core/Classes/EditorSettings/SerializationMode.cs
diff --git a/AssetRipperCommon/Classes/EditorSettings/SpritePackerMode.cs b/AssetRipper.Core/Classes/EditorSettings/SpritePackerMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/EditorSettings/SpritePackerMode.cs
rename to AssetRipper.Core/Classes/EditorSettings/SpritePackerMode.cs
diff --git a/AssetRipperCommon/Classes/Flare/TextureLayout.cs b/AssetRipper.Core/Classes/Flare/TextureLayout.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Flare/TextureLayout.cs
rename to AssetRipper.Core/Classes/Flare/TextureLayout.cs
diff --git a/AssetRipperCommon/Classes/GraphicsSettings/BuiltinShaderMode.cs b/AssetRipper.Core/Classes/GraphicsSettings/BuiltinShaderMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/GraphicsSettings/BuiltinShaderMode.cs
rename to AssetRipper.Core/Classes/GraphicsSettings/BuiltinShaderMode.cs
diff --git a/AssetRipperCommon/Classes/GraphicsSettings/CameraHDRMode.cs b/AssetRipper.Core/Classes/GraphicsSettings/CameraHDRMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/GraphicsSettings/CameraHDRMode.cs
rename to AssetRipper.Core/Classes/GraphicsSettings/CameraHDRMode.cs
diff --git a/AssetRipperCommon/Classes/GraphicsSettings/GraphicsTier.cs b/AssetRipper.Core/Classes/GraphicsSettings/GraphicsTier.cs
similarity index 100%
rename from AssetRipperCommon/Classes/GraphicsSettings/GraphicsTier.cs
rename to AssetRipper.Core/Classes/GraphicsSettings/GraphicsTier.cs
diff --git a/AssetRipperCommon/Classes/GraphicsSettings/InstancingStrippingVariant.cs b/AssetRipper.Core/Classes/GraphicsSettings/InstancingStrippingVariant.cs
similarity index 100%
rename from AssetRipperCommon/Classes/GraphicsSettings/InstancingStrippingVariant.cs
rename to AssetRipper.Core/Classes/GraphicsSettings/InstancingStrippingVariant.cs
diff --git a/AssetRipperCommon/Classes/GraphicsSettings/LightmapStrippingMode.cs b/AssetRipper.Core/Classes/GraphicsSettings/LightmapStrippingMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/GraphicsSettings/LightmapStrippingMode.cs
rename to AssetRipper.Core/Classes/GraphicsSettings/LightmapStrippingMode.cs
diff --git a/AssetRipperCommon/Classes/GraphicsSettings/RealtimeGICPUUsage.cs b/AssetRipper.Core/Classes/GraphicsSettings/RealtimeGICPUUsage.cs
similarity index 100%
rename from AssetRipperCommon/Classes/GraphicsSettings/RealtimeGICPUUsage.cs
rename to AssetRipper.Core/Classes/GraphicsSettings/RealtimeGICPUUsage.cs
diff --git a/AssetRipperCommon/Classes/GraphicsSettings/ShaderQuality.cs b/AssetRipper.Core/Classes/GraphicsSettings/ShaderQuality.cs
similarity index 100%
rename from AssetRipperCommon/Classes/GraphicsSettings/ShaderQuality.cs
rename to AssetRipper.Core/Classes/GraphicsSettings/ShaderQuality.cs
diff --git a/AssetRipperCommon/Classes/GraphicsSettings/TransparencySortMode.cs b/AssetRipper.Core/Classes/GraphicsSettings/TransparencySortMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/GraphicsSettings/TransparencySortMode.cs
rename to AssetRipper.Core/Classes/GraphicsSettings/TransparencySortMode.cs
diff --git a/AssetRipperCommon/Classes/InputManager/InputAxesDirection.cs b/AssetRipper.Core/Classes/InputManager/InputAxesDirection.cs
similarity index 100%
rename from AssetRipperCommon/Classes/InputManager/InputAxesDirection.cs
rename to AssetRipper.Core/Classes/InputManager/InputAxesDirection.cs
diff --git a/AssetRipperCommon/Classes/InputManager/InputAxisType.cs b/AssetRipper.Core/Classes/InputManager/InputAxisType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/InputManager/InputAxisType.cs
rename to AssetRipper.Core/Classes/InputManager/InputAxisType.cs
diff --git a/AssetRipperCommon/Classes/InputManager/JoystickType.cs b/AssetRipper.Core/Classes/InputManager/JoystickType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/InputManager/JoystickType.cs
rename to AssetRipper.Core/Classes/InputManager/JoystickType.cs
diff --git a/AssetRipperCommon/Classes/LODGroup/LODFadeMode.cs b/AssetRipper.Core/Classes/LODGroup/LODFadeMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/LODGroup/LODFadeMode.cs
rename to AssetRipper.Core/Classes/LODGroup/LODFadeMode.cs
diff --git a/AssetRipperCommon/Classes/Light/LightRenderMode.cs b/AssetRipper.Core/Classes/Light/LightRenderMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Light/LightRenderMode.cs
rename to AssetRipper.Core/Classes/Light/LightRenderMode.cs
diff --git a/AssetRipperCommon/Classes/Light/LightShadowCasterMode.cs b/AssetRipper.Core/Classes/Light/LightShadowCasterMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Light/LightShadowCasterMode.cs
rename to AssetRipper.Core/Classes/Light/LightShadowCasterMode.cs
diff --git a/AssetRipperCommon/Classes/Light/LightShadows.cs b/AssetRipper.Core/Classes/Light/LightShadows.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Light/LightShadows.cs
rename to AssetRipper.Core/Classes/Light/LightShadows.cs
diff --git a/AssetRipperCommon/Classes/Light/LightShape.cs b/AssetRipper.Core/Classes/Light/LightShape.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Light/LightShape.cs
rename to AssetRipper.Core/Classes/Light/LightShape.cs
diff --git a/AssetRipperCommon/Classes/Light/LightType.cs b/AssetRipper.Core/Classes/Light/LightType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Light/LightType.cs
rename to AssetRipper.Core/Classes/Light/LightType.cs
diff --git a/AssetRipperCommon/Classes/Light/LightmapBakeType.cs b/AssetRipper.Core/Classes/Light/LightmapBakeType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Light/LightmapBakeType.cs
rename to AssetRipper.Core/Classes/Light/LightmapBakeType.cs
diff --git a/AssetRipperCommon/Classes/Light/LightmappingMode.cs b/AssetRipper.Core/Classes/Light/LightmappingMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Light/LightmappingMode.cs
rename to AssetRipper.Core/Classes/Light/LightmappingMode.cs
diff --git a/AssetRipperCommon/Classes/Light/MixedLightingMode.cs b/AssetRipper.Core/Classes/Light/MixedLightingMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Light/MixedLightingMode.cs
rename to AssetRipper.Core/Classes/Light/MixedLightingMode.cs
diff --git a/AssetRipperCommon/Classes/LightmapSettings/DenoiserType.cs b/AssetRipper.Core/Classes/LightmapSettings/DenoiserType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/LightmapSettings/DenoiserType.cs
rename to AssetRipper.Core/Classes/LightmapSettings/DenoiserType.cs
diff --git a/AssetRipperCommon/Classes/LightmapSettings/FilterMode.cs b/AssetRipper.Core/Classes/LightmapSettings/FilterMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/LightmapSettings/FilterMode.cs
rename to AssetRipper.Core/Classes/LightmapSettings/FilterMode.cs
diff --git a/AssetRipperCommon/Classes/LightmapSettings/FilterType.cs b/AssetRipper.Core/Classes/LightmapSettings/FilterType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/LightmapSettings/FilterType.cs
rename to AssetRipper.Core/Classes/LightmapSettings/FilterType.cs
diff --git a/AssetRipperCommon/Classes/LightmapSettings/GISettings/EnvironmentAmbientMode.cs b/AssetRipper.Core/Classes/LightmapSettings/GISettings/EnvironmentAmbientMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/LightmapSettings/GISettings/EnvironmentAmbientMode.cs
rename to AssetRipper.Core/Classes/LightmapSettings/GISettings/EnvironmentAmbientMode.cs
diff --git a/AssetRipperCommon/Classes/LightmapSettings/GIWorkflowMode.cs b/AssetRipper.Core/Classes/LightmapSettings/GIWorkflowMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/LightmapSettings/GIWorkflowMode.cs
rename to AssetRipper.Core/Classes/LightmapSettings/GIWorkflowMode.cs
diff --git a/AssetRipperCommon/Classes/LightmapSettings/Lightmapper.cs b/AssetRipper.Core/Classes/LightmapSettings/Lightmapper.cs
similarity index 100%
rename from AssetRipperCommon/Classes/LightmapSettings/Lightmapper.cs
rename to AssetRipper.Core/Classes/LightmapSettings/Lightmapper.cs
diff --git a/AssetRipperCommon/Classes/LightmapSettings/LightmapsMode.cs b/AssetRipper.Core/Classes/LightmapSettings/LightmapsMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/LightmapSettings/LightmapsMode.cs
rename to AssetRipper.Core/Classes/LightmapSettings/LightmapsMode.cs
diff --git a/AssetRipperCommon/Classes/LightmapSettings/ReflectionCubemapCompression.cs b/AssetRipper.Core/Classes/LightmapSettings/ReflectionCubemapCompression.cs
similarity index 100%
rename from AssetRipperCommon/Classes/LightmapSettings/ReflectionCubemapCompression.cs
rename to AssetRipper.Core/Classes/LightmapSettings/ReflectionCubemapCompression.cs
diff --git a/AssetRipperCommon/Classes/LightmapSettings/Sampling.cs b/AssetRipper.Core/Classes/LightmapSettings/Sampling.cs
similarity index 100%
rename from AssetRipperCommon/Classes/LightmapSettings/Sampling.cs
rename to AssetRipper.Core/Classes/LightmapSettings/Sampling.cs
diff --git a/AssetRipperCommon/Classes/Mesh/IndexFormat.cs b/AssetRipper.Core/Classes/Mesh/IndexFormat.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Mesh/IndexFormat.cs
rename to AssetRipper.Core/Classes/Mesh/IndexFormat.cs
diff --git a/AssetRipperCommon/Classes/Mesh/MeshCompression.cs b/AssetRipper.Core/Classes/Mesh/MeshCompression.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Mesh/MeshCompression.cs
rename to AssetRipper.Core/Classes/Mesh/MeshCompression.cs
diff --git a/AssetRipperCommon/Classes/Mesh/MeshHelper.cs b/AssetRipper.Core/Classes/Mesh/MeshHelper.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Mesh/MeshHelper.cs
rename to AssetRipper.Core/Classes/Mesh/MeshHelper.cs
diff --git a/AssetRipperCommon/Classes/Mesh/MeshOptimizationFlags.cs b/AssetRipper.Core/Classes/Mesh/MeshOptimizationFlags.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Mesh/MeshOptimizationFlags.cs
rename to AssetRipper.Core/Classes/Mesh/MeshOptimizationFlags.cs
diff --git a/AssetRipperCommon/Classes/Mesh/MeshTopology.cs b/AssetRipper.Core/Classes/Mesh/MeshTopology.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Mesh/MeshTopology.cs
rename to AssetRipper.Core/Classes/Mesh/MeshTopology.cs
diff --git a/AssetRipperCommon/Classes/MeshCollider/MeshColliderCookingOptions.cs b/AssetRipper.Core/Classes/MeshCollider/MeshColliderCookingOptions.cs
similarity index 100%
rename from AssetRipperCommon/Classes/MeshCollider/MeshColliderCookingOptions.cs
rename to AssetRipper.Core/Classes/MeshCollider/MeshColliderCookingOptions.cs
diff --git a/AssetRipperCommon/Classes/Meta/Importers/Texture/AndroidETC2FallbackOverride.cs b/AssetRipper.Core/Classes/Meta/Importers/Texture/AndroidETC2FallbackOverride.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Meta/Importers/Texture/AndroidETC2FallbackOverride.cs
rename to AssetRipper.Core/Classes/Meta/Importers/Texture/AndroidETC2FallbackOverride.cs
diff --git a/AssetRipperCommon/Classes/Meta/Importers/Texture/SpriteAlignment.cs b/AssetRipper.Core/Classes/Meta/Importers/Texture/SpriteAlignment.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Meta/Importers/Texture/SpriteAlignment.cs
rename to AssetRipper.Core/Classes/Meta/Importers/Texture/SpriteAlignment.cs
diff --git a/AssetRipperCommon/Classes/Meta/Importers/Texture/SpriteImportMode.cs b/AssetRipper.Core/Classes/Meta/Importers/Texture/SpriteImportMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Meta/Importers/Texture/SpriteImportMode.cs
rename to AssetRipper.Core/Classes/Meta/Importers/Texture/SpriteImportMode.cs
diff --git a/AssetRipperCommon/Classes/Meta/Importers/Texture/TextureImporterAlphaSource.cs b/AssetRipper.Core/Classes/Meta/Importers/Texture/TextureImporterAlphaSource.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Meta/Importers/Texture/TextureImporterAlphaSource.cs
rename to AssetRipper.Core/Classes/Meta/Importers/Texture/TextureImporterAlphaSource.cs
diff --git a/AssetRipperCommon/Classes/Meta/Importers/Texture/TextureImporterCompression.cs b/AssetRipper.Core/Classes/Meta/Importers/Texture/TextureImporterCompression.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Meta/Importers/Texture/TextureImporterCompression.cs
rename to AssetRipper.Core/Classes/Meta/Importers/Texture/TextureImporterCompression.cs
diff --git a/AssetRipperCommon/Classes/Meta/Importers/Texture/TextureImporterGenerateCubemap.cs b/AssetRipper.Core/Classes/Meta/Importers/Texture/TextureImporterGenerateCubemap.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Meta/Importers/Texture/TextureImporterGenerateCubemap.cs
rename to AssetRipper.Core/Classes/Meta/Importers/Texture/TextureImporterGenerateCubemap.cs
diff --git a/AssetRipperCommon/Classes/Meta/Importers/Texture/TextureImporterMipFilter.cs b/AssetRipper.Core/Classes/Meta/Importers/Texture/TextureImporterMipFilter.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Meta/Importers/Texture/TextureImporterMipFilter.cs
rename to AssetRipper.Core/Classes/Meta/Importers/Texture/TextureImporterMipFilter.cs
diff --git a/AssetRipperCommon/Classes/Meta/Importers/Texture/TextureImporterNPOTScale.cs b/AssetRipper.Core/Classes/Meta/Importers/Texture/TextureImporterNPOTScale.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Meta/Importers/Texture/TextureImporterNPOTScale.cs
rename to AssetRipper.Core/Classes/Meta/Importers/Texture/TextureImporterNPOTScale.cs
diff --git a/AssetRipperCommon/Classes/Meta/Importers/Texture/TextureImporterNormalFilter.cs b/AssetRipper.Core/Classes/Meta/Importers/Texture/TextureImporterNormalFilter.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Meta/Importers/Texture/TextureImporterNormalFilter.cs
rename to AssetRipper.Core/Classes/Meta/Importers/Texture/TextureImporterNormalFilter.cs
diff --git a/AssetRipperCommon/Classes/Meta/Importers/Texture/TextureImporterShape.cs b/AssetRipper.Core/Classes/Meta/Importers/Texture/TextureImporterShape.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Meta/Importers/Texture/TextureImporterShape.cs
rename to AssetRipper.Core/Classes/Meta/Importers/Texture/TextureImporterShape.cs
diff --git a/AssetRipperCommon/Classes/Meta/Importers/Texture/TextureImporterType.cs b/AssetRipper.Core/Classes/Meta/Importers/Texture/TextureImporterType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Meta/Importers/Texture/TextureImporterType.cs
rename to AssetRipper.Core/Classes/Meta/Importers/Texture/TextureImporterType.cs
diff --git a/AssetRipperCommon/Classes/Meta/Importers/Texture/TextureResizeAlgorithm.cs b/AssetRipper.Core/Classes/Meta/Importers/Texture/TextureResizeAlgorithm.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Meta/Importers/Texture/TextureResizeAlgorithm.cs
rename to AssetRipper.Core/Classes/Meta/Importers/Texture/TextureResizeAlgorithm.cs
diff --git a/AssetRipperCommon/Classes/NavMeshAgent/ObstacleAvoidanceType.cs b/AssetRipper.Core/Classes/NavMeshAgent/ObstacleAvoidanceType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/NavMeshAgent/ObstacleAvoidanceType.cs
rename to AssetRipper.Core/Classes/NavMeshAgent/ObstacleAvoidanceType.cs
diff --git a/AssetRipperCommon/Classes/NavMeshObstacle/NavMeshObstacleShape.cs b/AssetRipper.Core/Classes/NavMeshObstacle/NavMeshObstacleShape.cs
similarity index 100%
rename from AssetRipperCommon/Classes/NavMeshObstacle/NavMeshObstacleShape.cs
rename to AssetRipper.Core/Classes/NavMeshObstacle/NavMeshObstacleShape.cs
diff --git a/AssetRipperCommon/Classes/ParticleSystem/CollisionModule/ParticleSystemCollisionMode.cs b/AssetRipper.Core/Classes/ParticleSystem/CollisionModule/ParticleSystemCollisionMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/ParticleSystem/CollisionModule/ParticleSystemCollisionMode.cs
rename to AssetRipper.Core/Classes/ParticleSystem/CollisionModule/ParticleSystemCollisionMode.cs
diff --git a/AssetRipperCommon/Classes/ParticleSystem/CollisionModule/ParticleSystemCollisionQuality.cs b/AssetRipper.Core/Classes/ParticleSystem/CollisionModule/ParticleSystemCollisionQuality.cs
similarity index 100%
rename from AssetRipperCommon/Classes/ParticleSystem/CollisionModule/ParticleSystemCollisionQuality.cs
rename to AssetRipper.Core/Classes/ParticleSystem/CollisionModule/ParticleSystemCollisionQuality.cs
diff --git a/AssetRipperCommon/Classes/ParticleSystem/CollisionModule/ParticleSystemCollisionType.cs b/AssetRipper.Core/Classes/ParticleSystem/CollisionModule/ParticleSystemCollisionType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/ParticleSystem/CollisionModule/ParticleSystemCollisionType.cs
rename to AssetRipper.Core/Classes/ParticleSystem/CollisionModule/ParticleSystemCollisionType.cs
diff --git a/AssetRipperCommon/Classes/ParticleSystem/Curve/ParticleSystemCurveMode.cs b/AssetRipper.Core/Classes/ParticleSystem/Curve/ParticleSystemCurveMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/ParticleSystem/Curve/ParticleSystemCurveMode.cs
rename to AssetRipper.Core/Classes/ParticleSystem/Curve/ParticleSystemCurveMode.cs
diff --git a/AssetRipperCommon/Classes/ParticleSystem/CustomDataModule/ParticleSystemCustomDataMode.cs b/AssetRipper.Core/Classes/ParticleSystem/CustomDataModule/ParticleSystemCustomDataMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/ParticleSystem/CustomDataModule/ParticleSystemCustomDataMode.cs
rename to AssetRipper.Core/Classes/ParticleSystem/CustomDataModule/ParticleSystemCustomDataMode.cs
diff --git a/AssetRipperCommon/Classes/ParticleSystem/Emission/EmissionType.cs b/AssetRipper.Core/Classes/ParticleSystem/Emission/EmissionType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/ParticleSystem/Emission/EmissionType.cs
rename to AssetRipper.Core/Classes/ParticleSystem/Emission/EmissionType.cs
diff --git a/AssetRipperCommon/Classes/ParticleSystem/InheritVelocity/InheritVelocityMode.cs b/AssetRipper.Core/Classes/ParticleSystem/InheritVelocity/InheritVelocityMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/ParticleSystem/InheritVelocity/InheritVelocityMode.cs
rename to AssetRipper.Core/Classes/ParticleSystem/InheritVelocity/InheritVelocityMode.cs
diff --git a/AssetRipperCommon/Classes/ParticleSystem/MinMaxGradient/MinMaxGradientState.cs b/AssetRipper.Core/Classes/ParticleSystem/MinMaxGradient/MinMaxGradientState.cs
similarity index 100%
rename from AssetRipperCommon/Classes/ParticleSystem/MinMaxGradient/MinMaxGradientState.cs
rename to AssetRipper.Core/Classes/ParticleSystem/MinMaxGradient/MinMaxGradientState.cs
diff --git a/AssetRipperCommon/Classes/ParticleSystem/NoiseModule/ParticleSystemNoiseQuality.cs b/AssetRipper.Core/Classes/ParticleSystem/NoiseModule/ParticleSystemNoiseQuality.cs
similarity index 100%
rename from AssetRipperCommon/Classes/ParticleSystem/NoiseModule/ParticleSystemNoiseQuality.cs
rename to AssetRipper.Core/Classes/ParticleSystem/NoiseModule/ParticleSystemNoiseQuality.cs
diff --git a/AssetRipperCommon/Classes/ParticleSystem/ParticleSystemCullingMode.cs b/AssetRipper.Core/Classes/ParticleSystem/ParticleSystemCullingMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/ParticleSystem/ParticleSystemCullingMode.cs
rename to AssetRipper.Core/Classes/ParticleSystem/ParticleSystemCullingMode.cs
diff --git a/AssetRipperCommon/Classes/ParticleSystem/ParticleSystemRingBufferMode.cs b/AssetRipper.Core/Classes/ParticleSystem/ParticleSystemRingBufferMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/ParticleSystem/ParticleSystemRingBufferMode.cs
rename to AssetRipper.Core/Classes/ParticleSystem/ParticleSystemRingBufferMode.cs
diff --git a/AssetRipperCommon/Classes/ParticleSystem/ParticleSystemScalingMode.cs b/AssetRipper.Core/Classes/ParticleSystem/ParticleSystemScalingMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/ParticleSystem/ParticleSystemScalingMode.cs
rename to AssetRipper.Core/Classes/ParticleSystem/ParticleSystemScalingMode.cs
diff --git a/AssetRipperCommon/Classes/ParticleSystem/ParticleSystemSimulationSpace.cs b/AssetRipper.Core/Classes/ParticleSystem/ParticleSystemSimulationSpace.cs
similarity index 100%
rename from AssetRipperCommon/Classes/ParticleSystem/ParticleSystemSimulationSpace.cs
rename to AssetRipper.Core/Classes/ParticleSystem/ParticleSystemSimulationSpace.cs
diff --git a/AssetRipperCommon/Classes/ParticleSystem/ParticleSystemStopAction.cs b/AssetRipper.Core/Classes/ParticleSystem/ParticleSystemStopAction.cs
similarity index 100%
rename from AssetRipperCommon/Classes/ParticleSystem/ParticleSystemStopAction.cs
rename to AssetRipper.Core/Classes/ParticleSystem/ParticleSystemStopAction.cs
diff --git a/AssetRipperCommon/Classes/ParticleSystem/Shape/ParticleSystemShapeMultiModeValue.cs b/AssetRipper.Core/Classes/ParticleSystem/Shape/ParticleSystemShapeMultiModeValue.cs
similarity index 100%
rename from AssetRipperCommon/Classes/ParticleSystem/Shape/ParticleSystemShapeMultiModeValue.cs
rename to AssetRipper.Core/Classes/ParticleSystem/Shape/ParticleSystemShapeMultiModeValue.cs
diff --git a/AssetRipperCommon/Classes/ParticleSystem/Shape/ParticleSystemShapeType.cs b/AssetRipper.Core/Classes/ParticleSystem/Shape/ParticleSystemShapeType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/ParticleSystem/Shape/ParticleSystemShapeType.cs
rename to AssetRipper.Core/Classes/ParticleSystem/Shape/ParticleSystemShapeType.cs
diff --git a/AssetRipperCommon/Classes/ParticleSystem/Shape/PlacementMode.cs b/AssetRipper.Core/Classes/ParticleSystem/Shape/PlacementMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/ParticleSystem/Shape/PlacementMode.cs
rename to AssetRipper.Core/Classes/ParticleSystem/Shape/PlacementMode.cs
diff --git a/AssetRipperCommon/Classes/ParticleSystem/SubEmitter/ParticleSystemSubEmitterProperties.cs b/AssetRipper.Core/Classes/ParticleSystem/SubEmitter/ParticleSystemSubEmitterProperties.cs
similarity index 100%
rename from AssetRipperCommon/Classes/ParticleSystem/SubEmitter/ParticleSystemSubEmitterProperties.cs
rename to AssetRipper.Core/Classes/ParticleSystem/SubEmitter/ParticleSystemSubEmitterProperties.cs
diff --git a/AssetRipperCommon/Classes/ParticleSystem/SubEmitter/ParticleSystemSubEmitterType.cs b/AssetRipper.Core/Classes/ParticleSystem/SubEmitter/ParticleSystemSubEmitterType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/ParticleSystem/SubEmitter/ParticleSystemSubEmitterType.cs
rename to AssetRipper.Core/Classes/ParticleSystem/SubEmitter/ParticleSystemSubEmitterType.cs
diff --git a/AssetRipperCommon/Classes/ParticleSystem/TrailModule/ParticleSystemTrailMode.cs b/AssetRipper.Core/Classes/ParticleSystem/TrailModule/ParticleSystemTrailMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/ParticleSystem/TrailModule/ParticleSystemTrailMode.cs
rename to AssetRipper.Core/Classes/ParticleSystem/TrailModule/ParticleSystemTrailMode.cs
diff --git a/AssetRipperCommon/Classes/ParticleSystem/TrailModule/ParticleSystemTrailTextureMode.cs b/AssetRipper.Core/Classes/ParticleSystem/TrailModule/ParticleSystemTrailTextureMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/ParticleSystem/TrailModule/ParticleSystemTrailTextureMode.cs
rename to AssetRipper.Core/Classes/ParticleSystem/TrailModule/ParticleSystemTrailTextureMode.cs
diff --git a/AssetRipperCommon/Classes/ParticleSystem/Trigger/TriggerAction.cs b/AssetRipper.Core/Classes/ParticleSystem/Trigger/TriggerAction.cs
similarity index 100%
rename from AssetRipperCommon/Classes/ParticleSystem/Trigger/TriggerAction.cs
rename to AssetRipper.Core/Classes/ParticleSystem/Trigger/TriggerAction.cs
diff --git a/AssetRipperCommon/Classes/ParticleSystem/UV/ParticleSystemAnimationMode.cs b/AssetRipper.Core/Classes/ParticleSystem/UV/ParticleSystemAnimationMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/ParticleSystem/UV/ParticleSystemAnimationMode.cs
rename to AssetRipper.Core/Classes/ParticleSystem/UV/ParticleSystemAnimationMode.cs
diff --git a/AssetRipperCommon/Classes/ParticleSystem/UV/ParticleSystemAnimationRowMode.cs b/AssetRipper.Core/Classes/ParticleSystem/UV/ParticleSystemAnimationRowMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/ParticleSystem/UV/ParticleSystemAnimationRowMode.cs
rename to AssetRipper.Core/Classes/ParticleSystem/UV/ParticleSystemAnimationRowMode.cs
diff --git a/AssetRipperCommon/Classes/ParticleSystem/UV/ParticleSystemAnimationTimeMode.cs b/AssetRipper.Core/Classes/ParticleSystem/UV/ParticleSystemAnimationTimeMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/ParticleSystem/UV/ParticleSystemAnimationTimeMode.cs
rename to AssetRipper.Core/Classes/ParticleSystem/UV/ParticleSystemAnimationTimeMode.cs
diff --git a/AssetRipperCommon/Classes/ParticleSystem/UV/ParticleSystemAnimationType.cs b/AssetRipper.Core/Classes/ParticleSystem/UV/ParticleSystemAnimationType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/ParticleSystem/UV/ParticleSystemAnimationType.cs
rename to AssetRipper.Core/Classes/ParticleSystem/UV/ParticleSystemAnimationType.cs
diff --git a/AssetRipperCommon/Classes/ParticleSystemForceField/ParticleSystemForceFieldShape.cs b/AssetRipper.Core/Classes/ParticleSystemForceField/ParticleSystemForceFieldShape.cs
similarity index 100%
rename from AssetRipperCommon/Classes/ParticleSystemForceField/ParticleSystemForceFieldShape.cs
rename to AssetRipper.Core/Classes/ParticleSystemForceField/ParticleSystemForceFieldShape.cs
diff --git a/AssetRipperCommon/Classes/ParticleSystemRenderer/ParticleSystemRenderMode.cs b/AssetRipper.Core/Classes/ParticleSystemRenderer/ParticleSystemRenderMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/ParticleSystemRenderer/ParticleSystemRenderMode.cs
rename to AssetRipper.Core/Classes/ParticleSystemRenderer/ParticleSystemRenderMode.cs
diff --git a/AssetRipperCommon/Classes/ParticleSystemRenderer/ParticleSystemRenderSpace.cs b/AssetRipper.Core/Classes/ParticleSystemRenderer/ParticleSystemRenderSpace.cs
similarity index 100%
rename from AssetRipperCommon/Classes/ParticleSystemRenderer/ParticleSystemRenderSpace.cs
rename to AssetRipper.Core/Classes/ParticleSystemRenderer/ParticleSystemRenderSpace.cs
diff --git a/AssetRipperCommon/Classes/ParticleSystemRenderer/ParticleSystemSortMode.cs b/AssetRipper.Core/Classes/ParticleSystemRenderer/ParticleSystemSortMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/ParticleSystemRenderer/ParticleSystemSortMode.cs
rename to AssetRipper.Core/Classes/ParticleSystemRenderer/ParticleSystemSortMode.cs
diff --git a/AssetRipperCommon/Classes/PhysicsManager/BroadphaseType.cs b/AssetRipper.Core/Classes/PhysicsManager/BroadphaseType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/PhysicsManager/BroadphaseType.cs
rename to AssetRipper.Core/Classes/PhysicsManager/BroadphaseType.cs
diff --git a/AssetRipperCommon/Classes/PhysicsManager/ContactPairsMode.cs b/AssetRipper.Core/Classes/PhysicsManager/ContactPairsMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/PhysicsManager/ContactPairsMode.cs
rename to AssetRipper.Core/Classes/PhysicsManager/ContactPairsMode.cs
diff --git a/AssetRipperCommon/Classes/PhysicsManager/ContactsGeneration.cs b/AssetRipper.Core/Classes/PhysicsManager/ContactsGeneration.cs
similarity index 100%
rename from AssetRipperCommon/Classes/PhysicsManager/ContactsGeneration.cs
rename to AssetRipper.Core/Classes/PhysicsManager/ContactsGeneration.cs
diff --git a/AssetRipperCommon/Classes/PhysicsManager/FrictionType.cs b/AssetRipper.Core/Classes/PhysicsManager/FrictionType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/PhysicsManager/FrictionType.cs
rename to AssetRipper.Core/Classes/PhysicsManager/FrictionType.cs
diff --git a/AssetRipperCommon/Classes/PhysicsManager/SolverType.cs b/AssetRipper.Core/Classes/PhysicsManager/SolverType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/PhysicsManager/SolverType.cs
rename to AssetRipper.Core/Classes/PhysicsManager/SolverType.cs
diff --git a/AssetRipperCommon/Classes/QualitySettings/AnisotropicFiltering.cs b/AssetRipper.Core/Classes/QualitySettings/AnisotropicFiltering.cs
similarity index 100%
rename from AssetRipperCommon/Classes/QualitySettings/AnisotropicFiltering.cs
rename to AssetRipper.Core/Classes/QualitySettings/AnisotropicFiltering.cs
diff --git a/AssetRipperCommon/Classes/QualitySettings/AntiAliasing.cs b/AssetRipper.Core/Classes/QualitySettings/AntiAliasing.cs
similarity index 100%
rename from AssetRipperCommon/Classes/QualitySettings/AntiAliasing.cs
rename to AssetRipper.Core/Classes/QualitySettings/AntiAliasing.cs
diff --git a/AssetRipperCommon/Classes/QualitySettings/QualityLevel.cs b/AssetRipper.Core/Classes/QualitySettings/QualityLevel.cs
similarity index 100%
rename from AssetRipperCommon/Classes/QualitySettings/QualityLevel.cs
rename to AssetRipper.Core/Classes/QualitySettings/QualityLevel.cs
diff --git a/AssetRipperCommon/Classes/QualitySettings/ShadowCascades.cs b/AssetRipper.Core/Classes/QualitySettings/ShadowCascades.cs
similarity index 100%
rename from AssetRipperCommon/Classes/QualitySettings/ShadowCascades.cs
rename to AssetRipper.Core/Classes/QualitySettings/ShadowCascades.cs
diff --git a/AssetRipperCommon/Classes/QualitySettings/ShadowProjection.cs b/AssetRipper.Core/Classes/QualitySettings/ShadowProjection.cs
similarity index 100%
rename from AssetRipperCommon/Classes/QualitySettings/ShadowProjection.cs
rename to AssetRipper.Core/Classes/QualitySettings/ShadowProjection.cs
diff --git a/AssetRipperCommon/Classes/QualitySettings/ShadowQuality.cs b/AssetRipper.Core/Classes/QualitySettings/ShadowQuality.cs
similarity index 100%
rename from AssetRipperCommon/Classes/QualitySettings/ShadowQuality.cs
rename to AssetRipper.Core/Classes/QualitySettings/ShadowQuality.cs
diff --git a/AssetRipperCommon/Classes/QualitySettings/ShadowResolution.cs b/AssetRipper.Core/Classes/QualitySettings/ShadowResolution.cs
similarity index 100%
rename from AssetRipperCommon/Classes/QualitySettings/ShadowResolution.cs
rename to AssetRipper.Core/Classes/QualitySettings/ShadowResolution.cs
diff --git a/AssetRipperCommon/Classes/QualitySettings/ShadowmaskMode.cs b/AssetRipper.Core/Classes/QualitySettings/ShadowmaskMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/QualitySettings/ShadowmaskMode.cs
rename to AssetRipper.Core/Classes/QualitySettings/ShadowmaskMode.cs
diff --git a/AssetRipperCommon/Classes/QualitySettings/SkinWeights.cs b/AssetRipper.Core/Classes/QualitySettings/SkinWeights.cs
similarity index 100%
rename from AssetRipperCommon/Classes/QualitySettings/SkinWeights.cs
rename to AssetRipper.Core/Classes/QualitySettings/SkinWeights.cs
diff --git a/AssetRipperCommon/Classes/QualitySettings/TextureQuality.cs b/AssetRipper.Core/Classes/QualitySettings/TextureQuality.cs
similarity index 100%
rename from AssetRipperCommon/Classes/QualitySettings/TextureQuality.cs
rename to AssetRipper.Core/Classes/QualitySettings/TextureQuality.cs
diff --git a/AssetRipperCommon/Classes/QualitySettings/VSyncCount.cs b/AssetRipper.Core/Classes/QualitySettings/VSyncCount.cs
similarity index 100%
rename from AssetRipperCommon/Classes/QualitySettings/VSyncCount.cs
rename to AssetRipper.Core/Classes/QualitySettings/VSyncCount.cs
diff --git a/AssetRipperCommon/Classes/ReflectionProbe/ReflectionProbeClearFlags.cs b/AssetRipper.Core/Classes/ReflectionProbe/ReflectionProbeClearFlags.cs
similarity index 100%
rename from AssetRipperCommon/Classes/ReflectionProbe/ReflectionProbeClearFlags.cs
rename to AssetRipper.Core/Classes/ReflectionProbe/ReflectionProbeClearFlags.cs
diff --git a/AssetRipperCommon/Classes/ReflectionProbe/ReflectionProbeMode.cs b/AssetRipper.Core/Classes/ReflectionProbe/ReflectionProbeMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/ReflectionProbe/ReflectionProbeMode.cs
rename to AssetRipper.Core/Classes/ReflectionProbe/ReflectionProbeMode.cs
diff --git a/AssetRipperCommon/Classes/ReflectionProbe/ReflectionProbeRefreshMode.cs b/AssetRipper.Core/Classes/ReflectionProbe/ReflectionProbeRefreshMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/ReflectionProbe/ReflectionProbeRefreshMode.cs
rename to AssetRipper.Core/Classes/ReflectionProbe/ReflectionProbeRefreshMode.cs
diff --git a/AssetRipperCommon/Classes/ReflectionProbe/ReflectionProbeTimeSlicingMode.cs b/AssetRipper.Core/Classes/ReflectionProbe/ReflectionProbeTimeSlicingMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/ReflectionProbe/ReflectionProbeTimeSlicingMode.cs
rename to AssetRipper.Core/Classes/ReflectionProbe/ReflectionProbeTimeSlicingMode.cs
diff --git a/AssetRipperCommon/Classes/ReflectionProbe/ReflectionProbeType.cs b/AssetRipper.Core/Classes/ReflectionProbe/ReflectionProbeType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/ReflectionProbe/ReflectionProbeType.cs
rename to AssetRipper.Core/Classes/ReflectionProbe/ReflectionProbeType.cs
diff --git a/AssetRipperCommon/Classes/RenderSettings/AmbientMode.cs b/AssetRipper.Core/Classes/RenderSettings/AmbientMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/RenderSettings/AmbientMode.cs
rename to AssetRipper.Core/Classes/RenderSettings/AmbientMode.cs
diff --git a/AssetRipperCommon/Classes/RenderSettings/FogMode.cs b/AssetRipper.Core/Classes/RenderSettings/FogMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/RenderSettings/FogMode.cs
rename to AssetRipper.Core/Classes/RenderSettings/FogMode.cs
diff --git a/AssetRipperCommon/Classes/RenderTexture/RenderTextureFormat.cs b/AssetRipper.Core/Classes/RenderTexture/RenderTextureFormat.cs
similarity index 100%
rename from AssetRipperCommon/Classes/RenderTexture/RenderTextureFormat.cs
rename to AssetRipper.Core/Classes/RenderTexture/RenderTextureFormat.cs
diff --git a/AssetRipperCommon/Classes/Renderer/EditorSelectedRenderState.cs b/AssetRipper.Core/Classes/Renderer/EditorSelectedRenderState.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Renderer/EditorSelectedRenderState.cs
rename to AssetRipper.Core/Classes/Renderer/EditorSelectedRenderState.cs
diff --git a/AssetRipperCommon/Classes/Renderer/LightProbeUsage.cs b/AssetRipper.Core/Classes/Renderer/LightProbeUsage.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Renderer/LightProbeUsage.cs
rename to AssetRipper.Core/Classes/Renderer/LightProbeUsage.cs
diff --git a/AssetRipperCommon/Classes/Renderer/MotionVectorGenerationMode.cs b/AssetRipper.Core/Classes/Renderer/MotionVectorGenerationMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Renderer/MotionVectorGenerationMode.cs
rename to AssetRipper.Core/Classes/Renderer/MotionVectorGenerationMode.cs
diff --git a/AssetRipperCommon/Classes/Renderer/RayTracingMode.cs b/AssetRipper.Core/Classes/Renderer/RayTracingMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Renderer/RayTracingMode.cs
rename to AssetRipper.Core/Classes/Renderer/RayTracingMode.cs
diff --git a/AssetRipperCommon/Classes/Renderer/ReceiveGI.cs b/AssetRipper.Core/Classes/Renderer/ReceiveGI.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Renderer/ReceiveGI.cs
rename to AssetRipper.Core/Classes/Renderer/ReceiveGI.cs
diff --git a/AssetRipperCommon/Classes/Renderer/ReflectionProbeUsage.cs b/AssetRipper.Core/Classes/Renderer/ReflectionProbeUsage.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Renderer/ReflectionProbeUsage.cs
rename to AssetRipper.Core/Classes/Renderer/ReflectionProbeUsage.cs
diff --git a/AssetRipperCommon/Classes/Renderer/ShadowCastingMode.cs b/AssetRipper.Core/Classes/Renderer/ShadowCastingMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Renderer/ShadowCastingMode.cs
rename to AssetRipper.Core/Classes/Renderer/ShadowCastingMode.cs
diff --git a/AssetRipperCommon/Classes/Rigidbody/CollisionDetectionMode.cs b/AssetRipper.Core/Classes/Rigidbody/CollisionDetectionMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Rigidbody/CollisionDetectionMode.cs
rename to AssetRipper.Core/Classes/Rigidbody/CollisionDetectionMode.cs
diff --git a/AssetRipperCommon/Classes/Rigidbody/RigidbodyConstraints.cs b/AssetRipper.Core/Classes/Rigidbody/RigidbodyConstraints.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Rigidbody/RigidbodyConstraints.cs
rename to AssetRipper.Core/Classes/Rigidbody/RigidbodyConstraints.cs
diff --git a/AssetRipperCommon/Classes/Rigidbody/RigidbodyInterpolation.cs b/AssetRipper.Core/Classes/Rigidbody/RigidbodyInterpolation.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Rigidbody/RigidbodyInterpolation.cs
rename to AssetRipper.Core/Classes/Rigidbody/RigidbodyInterpolation.cs
diff --git a/AssetRipperCommon/Classes/Rigidbody2D/CollisionDetectionMode2D.cs b/AssetRipper.Core/Classes/Rigidbody2D/CollisionDetectionMode2D.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Rigidbody2D/CollisionDetectionMode2D.cs
rename to AssetRipper.Core/Classes/Rigidbody2D/CollisionDetectionMode2D.cs
diff --git a/AssetRipperCommon/Classes/Rigidbody2D/RigidbodyConstraints2D.cs b/AssetRipper.Core/Classes/Rigidbody2D/RigidbodyConstraints2D.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Rigidbody2D/RigidbodyConstraints2D.cs
rename to AssetRipper.Core/Classes/Rigidbody2D/RigidbodyConstraints2D.cs
diff --git a/AssetRipperCommon/Classes/Rigidbody2D/RigidbodyInterpolation2D.cs b/AssetRipper.Core/Classes/Rigidbody2D/RigidbodyInterpolation2D.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Rigidbody2D/RigidbodyInterpolation2D.cs
rename to AssetRipper.Core/Classes/Rigidbody2D/RigidbodyInterpolation2D.cs
diff --git a/AssetRipperCommon/Classes/Rigidbody2D/RigidbodySleepMode2D.cs b/AssetRipper.Core/Classes/Rigidbody2D/RigidbodySleepMode2D.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Rigidbody2D/RigidbodySleepMode2D.cs
rename to AssetRipper.Core/Classes/Rigidbody2D/RigidbodySleepMode2D.cs
diff --git a/AssetRipperCommon/Classes/Rigidbody2D/RigidbodyType2D.cs b/AssetRipper.Core/Classes/Rigidbody2D/RigidbodyType2D.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Rigidbody2D/RigidbodyType2D.cs
rename to AssetRipper.Core/Classes/Rigidbody2D/RigidbodyType2D.cs
diff --git a/AssetRipperCommon/Classes/Shader/Enums/GPUPlatform.cs b/AssetRipper.Core/Classes/Shader/Enums/GPUPlatform.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Shader/Enums/GPUPlatform.cs
rename to AssetRipper.Core/Classes/Shader/Enums/GPUPlatform.cs
diff --git a/AssetRipperCommon/Classes/Shader/Enums/GpuProgramType/ShaderGpuProgramType.cs b/AssetRipper.Core/Classes/Shader/Enums/GpuProgramType/ShaderGpuProgramType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Shader/Enums/GpuProgramType/ShaderGpuProgramType.cs
rename to AssetRipper.Core/Classes/Shader/Enums/GpuProgramType/ShaderGpuProgramType.cs
diff --git a/AssetRipperCommon/Classes/Shader/Enums/GpuProgramType/ShaderGpuProgramType53.cs b/AssetRipper.Core/Classes/Shader/Enums/GpuProgramType/ShaderGpuProgramType53.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Shader/Enums/GpuProgramType/ShaderGpuProgramType53.cs
rename to AssetRipper.Core/Classes/Shader/Enums/GpuProgramType/ShaderGpuProgramType53.cs
diff --git a/AssetRipperCommon/Classes/Shader/Enums/GpuProgramType/ShaderGpuProgramType55.cs b/AssetRipper.Core/Classes/Shader/Enums/GpuProgramType/ShaderGpuProgramType55.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Shader/Enums/GpuProgramType/ShaderGpuProgramType55.cs
rename to AssetRipper.Core/Classes/Shader/Enums/GpuProgramType/ShaderGpuProgramType55.cs
diff --git a/AssetRipperCommon/Classes/Shader/Enums/ShaderChannel/ShaderChannel.cs b/AssetRipper.Core/Classes/Shader/Enums/ShaderChannel/ShaderChannel.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Shader/Enums/ShaderChannel/ShaderChannel.cs
rename to AssetRipper.Core/Classes/Shader/Enums/ShaderChannel/ShaderChannel.cs
diff --git a/AssetRipperCommon/Classes/Shader/Enums/ShaderChannel/ShaderChannel2018.cs b/AssetRipper.Core/Classes/Shader/Enums/ShaderChannel/ShaderChannel2018.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Shader/Enums/ShaderChannel/ShaderChannel2018.cs
rename to AssetRipper.Core/Classes/Shader/Enums/ShaderChannel/ShaderChannel2018.cs
diff --git a/AssetRipperCommon/Classes/Shader/Enums/ShaderChannel/ShaderChannel4.cs b/AssetRipper.Core/Classes/Shader/Enums/ShaderChannel/ShaderChannel4.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Shader/Enums/ShaderChannel/ShaderChannel4.cs
rename to AssetRipper.Core/Classes/Shader/Enums/ShaderChannel/ShaderChannel4.cs
diff --git a/AssetRipperCommon/Classes/Shader/Enums/ShaderChannel/ShaderChannel5.cs b/AssetRipper.Core/Classes/Shader/Enums/ShaderChannel/ShaderChannel5.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Shader/Enums/ShaderChannel/ShaderChannel5.cs
rename to AssetRipper.Core/Classes/Shader/Enums/ShaderChannel/ShaderChannel5.cs
diff --git a/AssetRipperCommon/Classes/Shader/Enums/ShaderParamType.cs b/AssetRipper.Core/Classes/Shader/Enums/ShaderParamType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Shader/Enums/ShaderParamType.cs
rename to AssetRipper.Core/Classes/Shader/Enums/ShaderParamType.cs
diff --git a/AssetRipperCommon/Classes/Shader/Enums/ShaderType.cs b/AssetRipper.Core/Classes/Shader/Enums/ShaderType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Shader/Enums/ShaderType.cs
rename to AssetRipper.Core/Classes/Shader/Enums/ShaderType.cs
diff --git a/AssetRipperCommon/Classes/Shader/Enums/VertexComponent.cs b/AssetRipper.Core/Classes/Shader/Enums/VertexComponent.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Shader/Enums/VertexComponent.cs
rename to AssetRipper.Core/Classes/Shader/Enums/VertexComponent.cs
diff --git a/AssetRipperCommon/Classes/Shader/Enums/VertexFormat/VertexChannelFormat.cs b/AssetRipper.Core/Classes/Shader/Enums/VertexFormat/VertexChannelFormat.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Shader/Enums/VertexFormat/VertexChannelFormat.cs
rename to AssetRipper.Core/Classes/Shader/Enums/VertexFormat/VertexChannelFormat.cs
diff --git a/AssetRipperCommon/Classes/Shader/Enums/VertexFormat/VertexFormat.cs b/AssetRipper.Core/Classes/Shader/Enums/VertexFormat/VertexFormat.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Shader/Enums/VertexFormat/VertexFormat.cs
rename to AssetRipper.Core/Classes/Shader/Enums/VertexFormat/VertexFormat.cs
diff --git a/AssetRipperCommon/Classes/Shader/Enums/VertexFormat/VertexFormat2017.cs b/AssetRipper.Core/Classes/Shader/Enums/VertexFormat/VertexFormat2017.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Shader/Enums/VertexFormat/VertexFormat2017.cs
rename to AssetRipper.Core/Classes/Shader/Enums/VertexFormat/VertexFormat2017.cs
diff --git a/AssetRipperCommon/Classes/Shader/Enums/VertexFormat/VertexFormat2019.cs b/AssetRipper.Core/Classes/Shader/Enums/VertexFormat/VertexFormat2019.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Shader/Enums/VertexFormat/VertexFormat2019.cs
rename to AssetRipper.Core/Classes/Shader/Enums/VertexFormat/VertexFormat2019.cs
diff --git a/AssetRipperCommon/Classes/Shader/SerializedShader/Enum/BlendMode.cs b/AssetRipper.Core/Classes/Shader/SerializedShader/Enum/BlendMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Shader/SerializedShader/Enum/BlendMode.cs
rename to AssetRipper.Core/Classes/Shader/SerializedShader/Enum/BlendMode.cs
diff --git a/AssetRipperCommon/Classes/Shader/SerializedShader/Enum/BlendOp.cs b/AssetRipper.Core/Classes/Shader/SerializedShader/Enum/BlendOp.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Shader/SerializedShader/Enum/BlendOp.cs
rename to AssetRipper.Core/Classes/Shader/SerializedShader/Enum/BlendOp.cs
diff --git a/AssetRipperCommon/Classes/Shader/SerializedShader/Enum/ColorWriteMask.cs b/AssetRipper.Core/Classes/Shader/SerializedShader/Enum/ColorWriteMask.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Shader/SerializedShader/Enum/ColorWriteMask.cs
rename to AssetRipper.Core/Classes/Shader/SerializedShader/Enum/ColorWriteMask.cs
diff --git a/AssetRipperCommon/Classes/Shader/SerializedShader/Enum/CullMode.cs b/AssetRipper.Core/Classes/Shader/SerializedShader/Enum/CullMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Shader/SerializedShader/Enum/CullMode.cs
rename to AssetRipper.Core/Classes/Shader/SerializedShader/Enum/CullMode.cs
diff --git a/AssetRipperCommon/Classes/Shader/SerializedShader/Enum/FogMode.cs b/AssetRipper.Core/Classes/Shader/SerializedShader/Enum/FogMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Shader/SerializedShader/Enum/FogMode.cs
rename to AssetRipper.Core/Classes/Shader/SerializedShader/Enum/FogMode.cs
diff --git a/AssetRipperCommon/Classes/Shader/SerializedShader/Enum/SerializedPassType.cs b/AssetRipper.Core/Classes/Shader/SerializedShader/Enum/SerializedPassType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Shader/SerializedShader/Enum/SerializedPassType.cs
rename to AssetRipper.Core/Classes/Shader/SerializedShader/Enum/SerializedPassType.cs
diff --git a/AssetRipperCommon/Classes/Shader/SerializedShader/Enum/SerializedPropertyFlag.cs b/AssetRipper.Core/Classes/Shader/SerializedShader/Enum/SerializedPropertyFlag.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Shader/SerializedShader/Enum/SerializedPropertyFlag.cs
rename to AssetRipper.Core/Classes/Shader/SerializedShader/Enum/SerializedPropertyFlag.cs
diff --git a/AssetRipperCommon/Classes/Shader/SerializedShader/Enum/SerializedPropertyType.cs b/AssetRipper.Core/Classes/Shader/SerializedShader/Enum/SerializedPropertyType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Shader/SerializedShader/Enum/SerializedPropertyType.cs
rename to AssetRipper.Core/Classes/Shader/SerializedShader/Enum/SerializedPropertyType.cs
diff --git a/AssetRipperCommon/Classes/Shader/SerializedShader/Enum/StencilComp.cs b/AssetRipper.Core/Classes/Shader/SerializedShader/Enum/StencilComp.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Shader/SerializedShader/Enum/StencilComp.cs
rename to AssetRipper.Core/Classes/Shader/SerializedShader/Enum/StencilComp.cs
diff --git a/AssetRipperCommon/Classes/Shader/SerializedShader/Enum/StencilOp.cs b/AssetRipper.Core/Classes/Shader/SerializedShader/Enum/StencilOp.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Shader/SerializedShader/Enum/StencilOp.cs
rename to AssetRipper.Core/Classes/Shader/SerializedShader/Enum/StencilOp.cs
diff --git a/AssetRipperCommon/Classes/Shader/SerializedShader/Enum/StencilType.cs b/AssetRipper.Core/Classes/Shader/SerializedShader/Enum/StencilType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Shader/SerializedShader/Enum/StencilType.cs
rename to AssetRipper.Core/Classes/Shader/SerializedShader/Enum/StencilType.cs
diff --git a/AssetRipperCommon/Classes/Shader/SerializedShader/Enum/ZClip.cs b/AssetRipper.Core/Classes/Shader/SerializedShader/Enum/ZClip.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Shader/SerializedShader/Enum/ZClip.cs
rename to AssetRipper.Core/Classes/Shader/SerializedShader/Enum/ZClip.cs
diff --git a/AssetRipperCommon/Classes/Shader/SerializedShader/Enum/ZTest.cs b/AssetRipper.Core/Classes/Shader/SerializedShader/Enum/ZTest.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Shader/SerializedShader/Enum/ZTest.cs
rename to AssetRipper.Core/Classes/Shader/SerializedShader/Enum/ZTest.cs
diff --git a/AssetRipperCommon/Classes/Shader/SerializedShader/Enum/ZWrite.cs b/AssetRipper.Core/Classes/Shader/SerializedShader/Enum/ZWrite.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Shader/SerializedShader/Enum/ZWrite.cs
rename to AssetRipper.Core/Classes/Shader/SerializedShader/Enum/ZWrite.cs
diff --git a/AssetRipperCommon/Classes/ShaderVariantCollection/PassType.cs b/AssetRipper.Core/Classes/ShaderVariantCollection/PassType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/ShaderVariantCollection/PassType.cs
rename to AssetRipper.Core/Classes/ShaderVariantCollection/PassType.cs
diff --git a/AssetRipperCommon/Classes/Sprite/SpriteMeshType.cs b/AssetRipper.Core/Classes/Sprite/SpriteMeshType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Sprite/SpriteMeshType.cs
rename to AssetRipper.Core/Classes/Sprite/SpriteMeshType.cs
diff --git a/AssetRipperCommon/Classes/Sprite/SpritePackingMode.cs b/AssetRipper.Core/Classes/Sprite/SpritePackingMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Sprite/SpritePackingMode.cs
rename to AssetRipper.Core/Classes/Sprite/SpritePackingMode.cs
diff --git a/AssetRipperCommon/Classes/Sprite/SpritePackingRotation.cs b/AssetRipper.Core/Classes/Sprite/SpritePackingRotation.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Sprite/SpritePackingRotation.cs
rename to AssetRipper.Core/Classes/Sprite/SpritePackingRotation.cs
diff --git a/AssetRipperCommon/Classes/SpriteRenderer/SpriteDrawMode.cs b/AssetRipper.Core/Classes/SpriteRenderer/SpriteDrawMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/SpriteRenderer/SpriteDrawMode.cs
rename to AssetRipper.Core/Classes/SpriteRenderer/SpriteDrawMode.cs
diff --git a/AssetRipperCommon/Classes/SpriteRenderer/SpriteMaskInteraction.cs b/AssetRipper.Core/Classes/SpriteRenderer/SpriteMaskInteraction.cs
similarity index 100%
rename from AssetRipperCommon/Classes/SpriteRenderer/SpriteMaskInteraction.cs
rename to AssetRipper.Core/Classes/SpriteRenderer/SpriteMaskInteraction.cs
diff --git a/AssetRipperCommon/Classes/SpriteRenderer/SpriteSortPoint.cs b/AssetRipper.Core/Classes/SpriteRenderer/SpriteSortPoint.cs
similarity index 100%
rename from AssetRipperCommon/Classes/SpriteRenderer/SpriteSortPoint.cs
rename to AssetRipper.Core/Classes/SpriteRenderer/SpriteSortPoint.cs
diff --git a/AssetRipperCommon/Classes/SpriteRenderer/SpriteTileMode.cs b/AssetRipper.Core/Classes/SpriteRenderer/SpriteTileMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/SpriteRenderer/SpriteTileMode.cs
rename to AssetRipper.Core/Classes/SpriteRenderer/SpriteTileMode.cs
diff --git a/AssetRipperCommon/Classes/TagManager/TagManagerConstants.cs b/AssetRipper.Core/Classes/TagManager/TagManagerConstants.cs
similarity index 100%
rename from AssetRipperCommon/Classes/TagManager/TagManagerConstants.cs
rename to AssetRipper.Core/Classes/TagManager/TagManagerConstants.cs
diff --git a/AssetRipperCommon/Classes/Terrain/MaterialType.cs b/AssetRipper.Core/Classes/Terrain/MaterialType.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Terrain/MaterialType.cs
rename to AssetRipper.Core/Classes/Terrain/MaterialType.cs
diff --git a/AssetRipperCommon/Classes/TerrainData/DetailRenderMode.cs b/AssetRipper.Core/Classes/TerrainData/DetailRenderMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/TerrainData/DetailRenderMode.cs
rename to AssetRipper.Core/Classes/TerrainData/DetailRenderMode.cs
diff --git a/AssetRipperCommon/Classes/Texture2D/ColorSpace.cs b/AssetRipper.Core/Classes/Texture2D/ColorSpace.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Texture2D/ColorSpace.cs
rename to AssetRipper.Core/Classes/Texture2D/ColorSpace.cs
diff --git a/AssetRipperCommon/Classes/Texture2D/FilterMode.cs b/AssetRipper.Core/Classes/Texture2D/FilterMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Texture2D/FilterMode.cs
rename to AssetRipper.Core/Classes/Texture2D/FilterMode.cs
diff --git a/AssetRipperCommon/Classes/Texture2D/TextureDimension.cs b/AssetRipper.Core/Classes/Texture2D/TextureDimension.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Texture2D/TextureDimension.cs
rename to AssetRipper.Core/Classes/Texture2D/TextureDimension.cs
diff --git a/AssetRipperCommon/Classes/Texture2D/TextureFormat.cs b/AssetRipper.Core/Classes/Texture2D/TextureFormat.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Texture2D/TextureFormat.cs
rename to AssetRipper.Core/Classes/Texture2D/TextureFormat.cs
diff --git a/AssetRipperCommon/Classes/Texture2D/TextureUsageMode.cs b/AssetRipper.Core/Classes/Texture2D/TextureUsageMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Texture2D/TextureUsageMode.cs
rename to AssetRipper.Core/Classes/Texture2D/TextureUsageMode.cs
diff --git a/AssetRipperCommon/Classes/Texture2D/TextureWrapMode.cs b/AssetRipper.Core/Classes/Texture2D/TextureWrapMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Texture2D/TextureWrapMode.cs
rename to AssetRipper.Core/Classes/Texture2D/TextureWrapMode.cs
diff --git a/AssetRipperCommon/Classes/Texture2DArray/GraphicsFormat.cs b/AssetRipper.Core/Classes/Texture2DArray/GraphicsFormat.cs
similarity index 100%
rename from AssetRipperCommon/Classes/Texture2DArray/GraphicsFormat.cs
rename to AssetRipper.Core/Classes/Texture2DArray/GraphicsFormat.cs
diff --git a/AssetRipperCommon/Classes/TrailRenderer/LineAlignment.cs b/AssetRipper.Core/Classes/TrailRenderer/LineAlignment.cs
similarity index 100%
rename from AssetRipperCommon/Classes/TrailRenderer/LineAlignment.cs
rename to AssetRipper.Core/Classes/TrailRenderer/LineAlignment.cs
diff --git a/AssetRipperCommon/Classes/TrailRenderer/LineTextureMode.cs b/AssetRipper.Core/Classes/TrailRenderer/LineTextureMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/TrailRenderer/LineTextureMode.cs
rename to AssetRipper.Core/Classes/TrailRenderer/LineTextureMode.cs
diff --git a/AssetRipperCommon/Classes/UI/Canvas/RenderMode.cs b/AssetRipper.Core/Classes/UI/Canvas/RenderMode.cs
similarity index 100%
rename from AssetRipperCommon/Classes/UI/Canvas/RenderMode.cs
rename to AssetRipper.Core/Classes/UI/Canvas/RenderMode.cs
diff --git a/AssetRipperCommon/Exceptions/UnbackedPropertyException.cs b/AssetRipper.Core/Exceptions/UnbackedPropertyException.cs
similarity index 100%
rename from AssetRipperCommon/Exceptions/UnbackedPropertyException.cs
rename to AssetRipper.Core/Exceptions/UnbackedPropertyException.cs
diff --git a/AssetRipperCommon/GlobalUsings.cs b/AssetRipper.Core/GlobalUsings.cs
similarity index 100%
rename from AssetRipperCommon/GlobalUsings.cs
rename to AssetRipper.Core/GlobalUsings.cs
diff --git a/AssetRipperCommon/Parser/Asset/AssetFactory.cs b/AssetRipper.Core/Parser/Asset/AssetFactory.cs
similarity index 100%
rename from AssetRipperCommon/Parser/Asset/AssetFactory.cs
rename to AssetRipper.Core/Parser/Asset/AssetFactory.cs
diff --git a/AssetRipperCommon/Project/Collections/AssetExportCollection.cs b/AssetRipper.Core/Project/Collections/AssetExportCollection.cs
similarity index 100%
rename from AssetRipperCommon/Project/Collections/AssetExportCollection.cs
rename to AssetRipper.Core/Project/Collections/AssetExportCollection.cs
diff --git a/AssetRipperCommon/Project/Collections/AssetsExportCollection.cs b/AssetRipper.Core/Project/Collections/AssetsExportCollection.cs
similarity index 100%
rename from AssetRipperCommon/Project/Collections/AssetsExportCollection.cs
rename to AssetRipper.Core/Project/Collections/AssetsExportCollection.cs
diff --git a/AssetRipperCommon/Project/Collections/BuildSettingsExportCollection.cs b/AssetRipper.Core/Project/Collections/BuildSettingsExportCollection.cs
similarity index 100%
rename from AssetRipperCommon/Project/Collections/BuildSettingsExportCollection.cs
rename to AssetRipper.Core/Project/Collections/BuildSettingsExportCollection.cs
diff --git a/AssetRipperCommon/Project/Collections/EmptyExportCollection.cs b/AssetRipper.Core/Project/Collections/EmptyExportCollection.cs
similarity index 100%
rename from AssetRipperCommon/Project/Collections/EmptyExportCollection.cs
rename to AssetRipper.Core/Project/Collections/EmptyExportCollection.cs
diff --git a/AssetRipperCommon/Project/Collections/EngineExportCollection.cs b/AssetRipper.Core/Project/Collections/EngineExportCollection.cs
similarity index 100%
rename from AssetRipperCommon/Project/Collections/EngineExportCollection.cs
rename to AssetRipper.Core/Project/Collections/EngineExportCollection.cs
diff --git a/AssetRipperCommon/Project/Collections/ExportCollection.cs b/AssetRipper.Core/Project/Collections/ExportCollection.cs
similarity index 100%
rename from AssetRipperCommon/Project/Collections/ExportCollection.cs
rename to AssetRipper.Core/Project/Collections/ExportCollection.cs
diff --git a/AssetRipperCommon/Project/Collections/FailExportCollection.cs b/AssetRipper.Core/Project/Collections/FailExportCollection.cs
similarity index 100%
rename from AssetRipperCommon/Project/Collections/FailExportCollection.cs
rename to AssetRipper.Core/Project/Collections/FailExportCollection.cs
diff --git a/AssetRipperCommon/Project/Collections/ManagerExportCollection.cs b/AssetRipper.Core/Project/Collections/ManagerExportCollection.cs
similarity index 100%
rename from AssetRipperCommon/Project/Collections/ManagerExportCollection.cs
rename to AssetRipper.Core/Project/Collections/ManagerExportCollection.cs
diff --git a/AssetRipperCommon/Project/Collections/PrefabExportCollection.cs b/AssetRipper.Core/Project/Collections/PrefabExportCollection.cs
similarity index 100%
rename from AssetRipperCommon/Project/Collections/PrefabExportCollection.cs
rename to AssetRipper.Core/Project/Collections/PrefabExportCollection.cs
diff --git a/AssetRipperCommon/Project/Collections/RawExportCollection.cs b/AssetRipper.Core/Project/Collections/RawExportCollection.cs
similarity index 100%
rename from AssetRipperCommon/Project/Collections/RawExportCollection.cs
rename to AssetRipper.Core/Project/Collections/RawExportCollection.cs
diff --git a/AssetRipperCommon/Project/Collections/SceneExportCollection.cs b/AssetRipper.Core/Project/Collections/SceneExportCollection.cs
similarity index 100%
rename from AssetRipperCommon/Project/Collections/SceneExportCollection.cs
rename to AssetRipper.Core/Project/Collections/SceneExportCollection.cs
diff --git a/AssetRipperCommon/Project/Collections/SkipExportCollection.cs b/AssetRipper.Core/Project/Collections/SkipExportCollection.cs
similarity index 100%
rename from AssetRipperCommon/Project/Collections/SkipExportCollection.cs
rename to AssetRipper.Core/Project/Collections/SkipExportCollection.cs
diff --git a/AssetRipperCommon/Project/Collections/UnknownExportCollection.cs b/AssetRipper.Core/Project/Collections/UnknownExportCollection.cs
similarity index 100%
rename from AssetRipperCommon/Project/Collections/UnknownExportCollection.cs
rename to AssetRipper.Core/Project/Collections/UnknownExportCollection.cs
diff --git a/AssetRipperCommon/Project/Collections/UnreadableExportCollection.cs b/AssetRipper.Core/Project/Collections/UnreadableExportCollection.cs
similarity index 100%
rename from AssetRipperCommon/Project/Collections/UnreadableExportCollection.cs
rename to AssetRipper.Core/Project/Collections/UnreadableExportCollection.cs
diff --git a/AssetRipperCommon/Project/Exporters/BinaryAssetExporter.cs b/AssetRipper.Core/Project/Exporters/BinaryAssetExporter.cs
similarity index 100%
rename from AssetRipperCommon/Project/Exporters/BinaryAssetExporter.cs
rename to AssetRipper.Core/Project/Exporters/BinaryAssetExporter.cs
diff --git a/AssetRipperCommon/Project/Exporters/BuildSettingsExporter.cs b/AssetRipper.Core/Project/Exporters/BuildSettingsExporter.cs
similarity index 100%
rename from AssetRipperCommon/Project/Exporters/BuildSettingsExporter.cs
rename to AssetRipper.Core/Project/Exporters/BuildSettingsExporter.cs
diff --git a/AssetRipperCommon/Project/Exporters/DefaultYamlExporter.cs b/AssetRipper.Core/Project/Exporters/DefaultYamlExporter.cs
similarity index 100%
rename from AssetRipperCommon/Project/Exporters/DefaultYamlExporter.cs
rename to AssetRipper.Core/Project/Exporters/DefaultYamlExporter.cs
diff --git a/AssetRipperCommon/Project/Exporters/DummyAssetExporter.cs b/AssetRipper.Core/Project/Exporters/DummyAssetExporter.cs
similarity index 100%
rename from AssetRipperCommon/Project/Exporters/DummyAssetExporter.cs
rename to AssetRipper.Core/Project/Exporters/DummyAssetExporter.cs
diff --git a/AssetRipperCommon/Project/Exporters/Engine/EngineAssetExporter.cs b/AssetRipper.Core/Project/Exporters/Engine/EngineAssetExporter.cs
similarity index 100%
rename from AssetRipperCommon/Project/Exporters/Engine/EngineAssetExporter.cs
rename to AssetRipper.Core/Project/Exporters/Engine/EngineAssetExporter.cs
diff --git a/AssetRipperCommon/Project/Exporters/Engine/EngineBuiltInAsset.cs b/AssetRipper.Core/Project/Exporters/Engine/EngineBuiltInAsset.cs
similarity index 100%
rename from AssetRipperCommon/Project/Exporters/Engine/EngineBuiltInAsset.cs
rename to AssetRipper.Core/Project/Exporters/Engine/EngineBuiltInAsset.cs
diff --git a/AssetRipperCommon/Project/Exporters/Engine/EngineBuiltInAssetInfo.cs b/AssetRipper.Core/Project/Exporters/Engine/EngineBuiltInAssetInfo.cs
similarity index 100%
rename from AssetRipperCommon/Project/Exporters/Engine/EngineBuiltInAssetInfo.cs
rename to AssetRipper.Core/Project/Exporters/Engine/EngineBuiltInAssetInfo.cs
diff --git a/AssetRipperCommon/Project/Exporters/Engine/EngineBuiltInAssets.cs b/AssetRipper.Core/Project/Exporters/Engine/EngineBuiltInAssets.cs
similarity index 100%
rename from AssetRipperCommon/Project/Exporters/Engine/EngineBuiltInAssets.cs
rename to AssetRipper.Core/Project/Exporters/Engine/EngineBuiltInAssets.cs
diff --git a/AssetRipperCommon/Project/Exporters/IAssetExporter.cs b/AssetRipper.Core/Project/Exporters/IAssetExporter.cs
similarity index 100%
rename from AssetRipperCommon/Project/Exporters/IAssetExporter.cs
rename to AssetRipper.Core/Project/Exporters/IAssetExporter.cs
diff --git a/AssetRipperCommon/Project/Exporters/ManagerAssetExporter.cs b/AssetRipper.Core/Project/Exporters/ManagerAssetExporter.cs
similarity index 100%
rename from AssetRipperCommon/Project/Exporters/ManagerAssetExporter.cs
rename to AssetRipper.Core/Project/Exporters/ManagerAssetExporter.cs
diff --git a/AssetRipperCommon/Project/Exporters/RawAssetExporter.cs b/AssetRipper.Core/Project/Exporters/RawAssetExporter.cs
similarity index 100%
rename from AssetRipperCommon/Project/Exporters/RawAssetExporter.cs
rename to AssetRipper.Core/Project/Exporters/RawAssetExporter.cs
diff --git a/AssetRipperCommon/Project/Exporters/SceneYamlExporter.cs b/AssetRipper.Core/Project/Exporters/SceneYamlExporter.cs
similarity index 100%
rename from AssetRipperCommon/Project/Exporters/SceneYamlExporter.cs
rename to AssetRipper.Core/Project/Exporters/SceneYamlExporter.cs
diff --git a/AssetRipperCommon/Project/Exporters/ScriptableObjectExporter.cs b/AssetRipper.Core/Project/Exporters/ScriptableObjectExporter.cs
similarity index 100%
rename from AssetRipperCommon/Project/Exporters/ScriptableObjectExporter.cs
rename to AssetRipper.Core/Project/Exporters/ScriptableObjectExporter.cs
diff --git a/AssetRipperCommon/Project/Exporters/UnknownObjectExporter.cs b/AssetRipper.Core/Project/Exporters/UnknownObjectExporter.cs
similarity index 100%
rename from AssetRipperCommon/Project/Exporters/UnknownObjectExporter.cs
rename to AssetRipper.Core/Project/Exporters/UnknownObjectExporter.cs
diff --git a/AssetRipperCommon/Project/Exporters/UnreadableObjectExporter.cs b/AssetRipper.Core/Project/Exporters/UnreadableObjectExporter.cs
similarity index 100%
rename from AssetRipperCommon/Project/Exporters/UnreadableObjectExporter.cs
rename to AssetRipper.Core/Project/Exporters/UnreadableObjectExporter.cs
diff --git a/AssetRipperCommon/Project/Exporters/YamlExporterBase.cs b/AssetRipper.Core/Project/Exporters/YamlExporterBase.cs
similarity index 100%
rename from AssetRipperCommon/Project/Exporters/YamlExporterBase.cs
rename to AssetRipper.Core/Project/Exporters/YamlExporterBase.cs
diff --git a/AssetRipperCommon/Project/ProjectAssetContainer.cs b/AssetRipper.Core/Project/ProjectAssetContainer.cs
similarity index 100%
rename from AssetRipperCommon/Project/ProjectAssetContainer.cs
rename to AssetRipper.Core/Project/ProjectAssetContainer.cs
diff --git a/AssetRipperCommon/Project/ProjectAssetPath.cs b/AssetRipper.Core/Project/ProjectAssetPath.cs
similarity index 100%
rename from AssetRipperCommon/Project/ProjectAssetPath.cs
rename to AssetRipper.Core/Project/ProjectAssetPath.cs
diff --git a/AssetRipperCommon/Project/ProjectExporter.cs b/AssetRipper.Core/Project/ProjectExporter.cs
similarity index 100%
rename from AssetRipperCommon/Project/ProjectExporter.cs
rename to AssetRipper.Core/Project/ProjectExporter.cs
diff --git a/AssetRipperCore/Properties/AssemblyInfo.cs b/AssetRipper.Core/Properties/AssemblyInfo.cs
similarity index 100%
rename from AssetRipperCore/Properties/AssemblyInfo.cs
rename to AssetRipper.Core/Properties/AssemblyInfo.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/AABBExtensions.cs b/AssetRipper.Core/SourceGenExtensions/AABBExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/AABBExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/AABBExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/AnimationClipBindingConstantExtensions.cs b/AssetRipper.Core/SourceGenExtensions/AnimationClipBindingConstantExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/AnimationClipBindingConstantExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/AnimationClipBindingConstantExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/AnimationClipExtensions.cs b/AssetRipper.Core/SourceGenExtensions/AnimationClipExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/AnimationClipExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/AnimationClipExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/AnimationCurveExtensions.cs b/AssetRipper.Core/SourceGenExtensions/AnimationCurveExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/AnimationCurveExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/AnimationCurveExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/AnimationExtensions.cs b/AssetRipper.Core/SourceGenExtensions/AnimationExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/AnimationExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/AnimationExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/AnimatorConditionExtensions.cs b/AssetRipper.Core/SourceGenExtensions/AnimatorConditionExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/AnimatorConditionExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/AnimatorConditionExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/AnimatorControllerExtensions.cs b/AssetRipper.Core/SourceGenExtensions/AnimatorControllerExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/AnimatorControllerExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/AnimatorControllerExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/AnimatorControllerLayerExtensions.cs b/AssetRipper.Core/SourceGenExtensions/AnimatorControllerLayerExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/AnimatorControllerLayerExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/AnimatorControllerLayerExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/AnimatorControllerParameterExtensions.cs b/AssetRipper.Core/SourceGenExtensions/AnimatorControllerParameterExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/AnimatorControllerParameterExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/AnimatorControllerParameterExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/AnimatorExtensions.cs b/AssetRipper.Core/SourceGenExtensions/AnimatorExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/AnimatorExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/AnimatorExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/AnimatorOverrideControllerExtensions.cs b/AssetRipper.Core/SourceGenExtensions/AnimatorOverrideControllerExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/AnimatorOverrideControllerExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/AnimatorOverrideControllerExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/AssetBundleExtensions.cs b/AssetRipper.Core/SourceGenExtensions/AssetBundleExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/AssetBundleExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/AssetBundleExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/AudioClipExtensions.cs b/AssetRipper.Core/SourceGenExtensions/AudioClipExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/AudioClipExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/AudioClipExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/AudioManagerExtensions.cs b/AssetRipper.Core/SourceGenExtensions/AudioManagerExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/AudioManagerExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/AudioManagerExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/AudioReverbFilterExtensions.cs b/AssetRipper.Core/SourceGenExtensions/AudioReverbFilterExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/AudioReverbFilterExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/AudioReverbFilterExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/AudioSourceExtensions.cs b/AssetRipper.Core/SourceGenExtensions/AudioSourceExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/AudioSourceExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/AudioSourceExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/AvatarConstantExtensions.cs b/AssetRipper.Core/SourceGenExtensions/AvatarConstantExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/AvatarConstantExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/AvatarConstantExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/AvatarExtensions.cs b/AssetRipper.Core/SourceGenExtensions/AvatarExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/AvatarExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/AvatarExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/BlendShapeDataExtensions.cs b/AssetRipper.Core/SourceGenExtensions/BlendShapeDataExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/BlendShapeDataExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/BlendShapeDataExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/BlendTreeExtensions.cs b/AssetRipper.Core/SourceGenExtensions/BlendTreeExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/BlendTreeExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/BlendTreeExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/BlendTreeNodeConstantExtensions.cs b/AssetRipper.Core/SourceGenExtensions/BlendTreeNodeConstantExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/BlendTreeNodeConstantExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/BlendTreeNodeConstantExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/BoneWeights4Extensions.cs b/AssetRipper.Core/SourceGenExtensions/BoneWeights4Extensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/BoneWeights4Extensions.cs
rename to AssetRipper.Core/SourceGenExtensions/BoneWeights4Extensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/BufferBindingExtensions.cs b/AssetRipper.Core/SourceGenExtensions/BufferBindingExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/BufferBindingExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/BufferBindingExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/BuiltinShaderSettingsExtensions.cs b/AssetRipper.Core/SourceGenExtensions/BuiltinShaderSettingsExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/BuiltinShaderSettingsExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/BuiltinShaderSettingsExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/CameraExtensions.cs b/AssetRipper.Core/SourceGenExtensions/CameraExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/CameraExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/CameraExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/CanvasExtensions.cs b/AssetRipper.Core/SourceGenExtensions/CanvasExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/CanvasExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/CanvasExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/CapsuleCollider2DExtensions.cs b/AssetRipper.Core/SourceGenExtensions/CapsuleCollider2DExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/CapsuleCollider2DExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/CapsuleCollider2DExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/ChannelInfoExtensions.cs b/AssetRipper.Core/SourceGenExtensions/ChannelInfoExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/ChannelInfoExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/ChannelInfoExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/ChildMotionExtensions.cs b/AssetRipper.Core/SourceGenExtensions/ChildMotionExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/ChildMotionExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/ChildMotionExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/ClipExtensions.cs b/AssetRipper.Core/SourceGenExtensions/ClipExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/ClipExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/ClipExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/CollisionModuleExtensions.cs b/AssetRipper.Core/SourceGenExtensions/CollisionModuleExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/CollisionModuleExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/CollisionModuleExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/ColorRGBA32Extensions.cs b/AssetRipper.Core/SourceGenExtensions/ColorRGBA32Extensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/ColorRGBA32Extensions.cs
rename to AssetRipper.Core/SourceGenExtensions/ColorRGBA32Extensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/ColorRGBAfExtensions.cs b/AssetRipper.Core/SourceGenExtensions/ColorRGBAfExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/ColorRGBAfExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/ColorRGBAfExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/ComponentExtensions.cs b/AssetRipper.Core/SourceGenExtensions/ComponentExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/ComponentExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/ComponentExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/CompositeCollider2DExtensions.cs b/AssetRipper.Core/SourceGenExtensions/CompositeCollider2DExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/CompositeCollider2DExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/CompositeCollider2DExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/CompressedAnimationCurveExtensions.cs b/AssetRipper.Core/SourceGenExtensions/CompressedAnimationCurveExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/CompressedAnimationCurveExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/CompressedAnimationCurveExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/CompressedMeshExtensions.cs b/AssetRipper.Core/SourceGenExtensions/CompressedMeshExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/CompressedMeshExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/CompressedMeshExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/ConditionConstantExtensions.cs b/AssetRipper.Core/SourceGenExtensions/ConditionConstantExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/ConditionConstantExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/ConditionConstantExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/ConstantClipExtensions.cs b/AssetRipper.Core/SourceGenExtensions/ConstantClipExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/ConstantClipExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/ConstantClipExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/ControllerConstantExtensions.cs b/AssetRipper.Core/SourceGenExtensions/ControllerConstantExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/ControllerConstantExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/ControllerConstantExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/CrashReportingSettingsExtensions.cs b/AssetRipper.Core/SourceGenExtensions/CrashReportingSettingsExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/CrashReportingSettingsExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/CrashReportingSettingsExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/CustomDataModuleExtensions.cs b/AssetRipper.Core/SourceGenExtensions/CustomDataModuleExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/CustomDataModuleExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/CustomDataModuleExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/DenseClipExtensions.cs b/AssetRipper.Core/SourceGenExtensions/DenseClipExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/DenseClipExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/DenseClipExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/DetailPrototypeExtensions.cs b/AssetRipper.Core/SourceGenExtensions/DetailPrototypeExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/DetailPrototypeExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/DetailPrototypeExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/EditorSettingsExtensions.cs b/AssetRipper.Core/SourceGenExtensions/EditorSettingsExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/EditorSettingsExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/EditorSettingsExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/EmissionModuleExtensions.cs b/AssetRipper.Core/SourceGenExtensions/EmissionModuleExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/EmissionModuleExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/EmissionModuleExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/ExternalForcesModuleExtensions.cs b/AssetRipper.Core/SourceGenExtensions/ExternalForcesModuleExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/ExternalForcesModuleExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/ExternalForcesModuleExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/FlareExtensions.cs b/AssetRipper.Core/SourceGenExtensions/FlareExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/FlareExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/FlareExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/FloatCurveExtensions.cs b/AssetRipper.Core/SourceGenExtensions/FloatCurveExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/FloatCurveExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/FloatCurveExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/FontExtensions.cs b/AssetRipper.Core/SourceGenExtensions/FontExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/FontExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/FontExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/GISettingsExtensions.cs b/AssetRipper.Core/SourceGenExtensions/GISettingsExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/GISettingsExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/GISettingsExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/GLTextureSettingsExtensions.cs b/AssetRipper.Core/SourceGenExtensions/GLTextureSettingsExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/GLTextureSettingsExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/GLTextureSettingsExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/GUITextExtensions.cs b/AssetRipper.Core/SourceGenExtensions/GUITextExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/GUITextExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/GUITextExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/GameObjectExtensions.cs b/AssetRipper.Core/SourceGenExtensions/GameObjectExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/GameObjectExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/GameObjectExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/GenericBindingExtensions.cs b/AssetRipper.Core/SourceGenExtensions/GenericBindingExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/GenericBindingExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/GenericBindingExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/GraphicsSettingsExtensions.cs b/AssetRipper.Core/SourceGenExtensions/GraphicsSettingsExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/GraphicsSettingsExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/GraphicsSettingsExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/GuidExtensions.cs b/AssetRipper.Core/SourceGenExtensions/GuidExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/GuidExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/GuidExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/HeightmapExtensions.cs b/AssetRipper.Core/SourceGenExtensions/HeightmapExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/HeightmapExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/HeightmapExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/HumanExtensions.cs b/AssetRipper.Core/SourceGenExtensions/HumanExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/HumanExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/HumanExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/IHVImageFormatImporterExtensions.cs b/AssetRipper.Core/SourceGenExtensions/IHVImageFormatImporterExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/IHVImageFormatImporterExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/IHVImageFormatImporterExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/InheritVelocityModuleExtensions.cs b/AssetRipper.Core/SourceGenExtensions/InheritVelocityModuleExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/InheritVelocityModuleExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/InheritVelocityModuleExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/InputAxisExtensions.cs b/AssetRipper.Core/SourceGenExtensions/InputAxisExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/InputAxisExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/InputAxisExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/KeyframeExtensions.Float.cs b/AssetRipper.Core/SourceGenExtensions/KeyframeExtensions.Float.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/KeyframeExtensions.Float.cs
rename to AssetRipper.Core/SourceGenExtensions/KeyframeExtensions.Float.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/KeyframeExtensions.Quaternionf.cs b/AssetRipper.Core/SourceGenExtensions/KeyframeExtensions.Quaternionf.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/KeyframeExtensions.Quaternionf.cs
rename to AssetRipper.Core/SourceGenExtensions/KeyframeExtensions.Quaternionf.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/KeyframeExtensions.Vector3f.cs b/AssetRipper.Core/SourceGenExtensions/KeyframeExtensions.Vector3f.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/KeyframeExtensions.Vector3f.cs
rename to AssetRipper.Core/SourceGenExtensions/KeyframeExtensions.Vector3f.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/LODExtensions.cs b/AssetRipper.Core/SourceGenExtensions/LODExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/LODExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/LODExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/LODGroupExtensions.cs b/AssetRipper.Core/SourceGenExtensions/LODGroupExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/LODGroupExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/LODGroupExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/LayerConstantExtensions.cs b/AssetRipper.Core/SourceGenExtensions/LayerConstantExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/LayerConstantExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/LayerConstantExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/LightExtensions.cs b/AssetRipper.Core/SourceGenExtensions/LightExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/LightExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/LightExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/LightmapBakeModeExtensions.cs b/AssetRipper.Core/SourceGenExtensions/LightmapBakeModeExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/LightmapBakeModeExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/LightmapBakeModeExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/LightmapEditorSettingsExtensions.cs b/AssetRipper.Core/SourceGenExtensions/LightmapEditorSettingsExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/LightmapEditorSettingsExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/LightmapEditorSettingsExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/LightmapSettingsExtensions.cs b/AssetRipper.Core/SourceGenExtensions/LightmapSettingsExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/LightmapSettingsExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/LightmapSettingsExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/LightsModuleExtensions.cs b/AssetRipper.Core/SourceGenExtensions/LightsModuleExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/LightsModuleExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/LightsModuleExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/LineParametersExtensions.cs b/AssetRipper.Core/SourceGenExtensions/LineParametersExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/LineParametersExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/LineParametersExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/MaterialExtensions.cs b/AssetRipper.Core/SourceGenExtensions/MaterialExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/MaterialExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/MaterialExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/MatrixParameterExtensions.cs b/AssetRipper.Core/SourceGenExtensions/MatrixParameterExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/MatrixParameterExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/MatrixParameterExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/MeshBlendShapeChannelExtensions.cs b/AssetRipper.Core/SourceGenExtensions/MeshBlendShapeChannelExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/MeshBlendShapeChannelExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/MeshBlendShapeChannelExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/MeshBlendShapeExtensions.cs b/AssetRipper.Core/SourceGenExtensions/MeshBlendShapeExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/MeshBlendShapeExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/MeshBlendShapeExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/MeshColliderExtensions.cs b/AssetRipper.Core/SourceGenExtensions/MeshColliderExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/MeshColliderExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/MeshColliderExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/MeshExtensions.cs b/AssetRipper.Core/SourceGenExtensions/MeshExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/MeshExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/MeshExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/MeshFilterExtensions.cs b/AssetRipper.Core/SourceGenExtensions/MeshFilterExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/MeshFilterExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/MeshFilterExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/MeshOutlineGenerator.cs b/AssetRipper.Core/SourceGenExtensions/MeshOutlineGenerator.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/MeshOutlineGenerator.cs
rename to AssetRipper.Core/SourceGenExtensions/MeshOutlineGenerator.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/MinMaxCurveExtensions.cs b/AssetRipper.Core/SourceGenExtensions/MinMaxCurveExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/MinMaxCurveExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/MinMaxCurveExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/MinMaxGradientExtensions.cs b/AssetRipper.Core/SourceGenExtensions/MinMaxGradientExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/MinMaxGradientExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/MinMaxGradientExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/MonoBehaviourExtensions.cs b/AssetRipper.Core/SourceGenExtensions/MonoBehaviourExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/MonoBehaviourExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/MonoBehaviourExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/MonoScriptExtensions.cs b/AssetRipper.Core/SourceGenExtensions/MonoScriptExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/MonoScriptExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/MonoScriptExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/MultiModeParameterExtensions.cs b/AssetRipper.Core/SourceGenExtensions/MultiModeParameterExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/MultiModeParameterExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/MultiModeParameterExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/MuscleClipInfoExtensions.cs b/AssetRipper.Core/SourceGenExtensions/MuscleClipInfoExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/MuscleClipInfoExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/MuscleClipInfoExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/NavMeshAgentExtensions.cs b/AssetRipper.Core/SourceGenExtensions/NavMeshAgentExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/NavMeshAgentExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/NavMeshAgentExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/NavMeshBuildSettingsExtensions.cs b/AssetRipper.Core/SourceGenExtensions/NavMeshBuildSettingsExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/NavMeshBuildSettingsExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/NavMeshBuildSettingsExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/NavMeshObstacleExtensions.cs b/AssetRipper.Core/SourceGenExtensions/NavMeshObstacleExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/NavMeshObstacleExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/NavMeshObstacleExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/NavMeshSettingsExtensions.cs b/AssetRipper.Core/SourceGenExtensions/NavMeshSettingsExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/NavMeshSettingsExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/NavMeshSettingsExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/NoiseModuleExtensions.cs b/AssetRipper.Core/SourceGenExtensions/NoiseModuleExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/NoiseModuleExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/NoiseModuleExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/OcclusionCullingDataExtensions.cs b/AssetRipper.Core/SourceGenExtensions/OcclusionCullingDataExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/OcclusionCullingDataExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/OcclusionCullingDataExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/PPtrCurveExtensions.cs b/AssetRipper.Core/SourceGenExtensions/PPtrCurveExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/PPtrCurveExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/PPtrCurveExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/PackedFloatVectorExtensions.cs b/AssetRipper.Core/SourceGenExtensions/PackedFloatVectorExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/PackedFloatVectorExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/PackedFloatVectorExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/PackedIntVectorExtensions.cs b/AssetRipper.Core/SourceGenExtensions/PackedIntVectorExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/PackedIntVectorExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/PackedIntVectorExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/PackedQuatVectorExtensions.cs b/AssetRipper.Core/SourceGenExtensions/PackedQuatVectorExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/PackedQuatVectorExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/PackedQuatVectorExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/PackingSettingsExtensions.cs b/AssetRipper.Core/SourceGenExtensions/PackingSettingsExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/PackingSettingsExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/PackingSettingsExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/ParticleSystemEmissionBurstExtensions.cs b/AssetRipper.Core/SourceGenExtensions/ParticleSystemEmissionBurstExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/ParticleSystemEmissionBurstExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/ParticleSystemEmissionBurstExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/ParticleSystemExtensions.cs b/AssetRipper.Core/SourceGenExtensions/ParticleSystemExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/ParticleSystemExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/ParticleSystemExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/ParticleSystemForceFieldParametersExtensions.cs b/AssetRipper.Core/SourceGenExtensions/ParticleSystemForceFieldParametersExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/ParticleSystemForceFieldParametersExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/ParticleSystemForceFieldParametersExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/ParticleSystemRendererExtensions.cs b/AssetRipper.Core/SourceGenExtensions/ParticleSystemRendererExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/ParticleSystemRendererExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/ParticleSystemRendererExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/Physics2DSettings.cs b/AssetRipper.Core/SourceGenExtensions/Physics2DSettings.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/Physics2DSettings.cs
rename to AssetRipper.Core/SourceGenExtensions/Physics2DSettings.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/PhysicsJobOptions2DExtensions.cs b/AssetRipper.Core/SourceGenExtensions/PhysicsJobOptions2DExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/PhysicsJobOptions2DExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/PhysicsJobOptions2DExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/PhysicsManagerExtensions.cs b/AssetRipper.Core/SourceGenExtensions/PhysicsManagerExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/PhysicsManagerExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/PhysicsManagerExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/PlatformShaderDefinesExtensions.cs b/AssetRipper.Core/SourceGenExtensions/PlatformShaderDefinesExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/PlatformShaderDefinesExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/PlatformShaderDefinesExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/PrefabInstanceExtensions.cs b/AssetRipper.Core/SourceGenExtensions/PrefabInstanceExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/PrefabInstanceExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/PrefabInstanceExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/QualitySettingExtensions.cs b/AssetRipper.Core/SourceGenExtensions/QualitySettingExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/QualitySettingExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/QualitySettingExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/QualitySettingsExtensions.cs b/AssetRipper.Core/SourceGenExtensions/QualitySettingsExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/QualitySettingsExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/QualitySettingsExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/QuaternionCurveExtensions.cs b/AssetRipper.Core/SourceGenExtensions/QuaternionCurveExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/QuaternionCurveExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/QuaternionCurveExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/RectfExtensions.cs b/AssetRipper.Core/SourceGenExtensions/RectfExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/RectfExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/RectfExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/ReflectionProbeExtensions.cs b/AssetRipper.Core/SourceGenExtensions/ReflectionProbeExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/ReflectionProbeExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/ReflectionProbeExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/RenderSettingsExtensions.cs b/AssetRipper.Core/SourceGenExtensions/RenderSettingsExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/RenderSettingsExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/RenderSettingsExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/RenderTextureExtensions.cs b/AssetRipper.Core/SourceGenExtensions/RenderTextureExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/RenderTextureExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/RenderTextureExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/RendererExtensions.cs b/AssetRipper.Core/SourceGenExtensions/RendererExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/RendererExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/RendererExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/Rigidbody2DExtensions.cs b/AssetRipper.Core/SourceGenExtensions/Rigidbody2DExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/Rigidbody2DExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/Rigidbody2DExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/RigidbodyExtensions.cs b/AssetRipper.Core/SourceGenExtensions/RigidbodyExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/RigidbodyExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/RigidbodyExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/RuntimeAnimatorControllerExtensions.cs b/AssetRipper.Core/SourceGenExtensions/RuntimeAnimatorControllerExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/RuntimeAnimatorControllerExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/RuntimeAnimatorControllerExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/SerializedPassExtensions.cs b/AssetRipper.Core/SourceGenExtensions/SerializedPassExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/SerializedPassExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/SerializedPassExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/SerializedProgramExtensions.cs b/AssetRipper.Core/SourceGenExtensions/SerializedProgramExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/SerializedProgramExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/SerializedProgramExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/SerializedPropertyExtensions.cs b/AssetRipper.Core/SourceGenExtensions/SerializedPropertyExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/SerializedPropertyExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/SerializedPropertyExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/SerializedShaderFloatValueExtensions.cs b/AssetRipper.Core/SourceGenExtensions/SerializedShaderFloatValueExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/SerializedShaderFloatValueExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/SerializedShaderFloatValueExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/SerializedShaderRTBlendStateExtensions.cs b/AssetRipper.Core/SourceGenExtensions/SerializedShaderRTBlendStateExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/SerializedShaderRTBlendStateExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/SerializedShaderRTBlendStateExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/SerializedShaderStateExtensions.cs b/AssetRipper.Core/SourceGenExtensions/SerializedShaderStateExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/SerializedShaderStateExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/SerializedShaderStateExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/SerializedShaderVectorValueExtensions.cs b/AssetRipper.Core/SourceGenExtensions/SerializedShaderVectorValueExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/SerializedShaderVectorValueExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/SerializedShaderVectorValueExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/SerializedStencilOpExtensions.cs b/AssetRipper.Core/SourceGenExtensions/SerializedStencilOpExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/SerializedStencilOpExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/SerializedStencilOpExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/SerializedSubProgramExtensions.cs b/AssetRipper.Core/SourceGenExtensions/SerializedSubProgramExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/SerializedSubProgramExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/SerializedSubProgramExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/ShaderBindChannelExtensions.cs b/AssetRipper.Core/SourceGenExtensions/ShaderBindChannelExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/ShaderBindChannelExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/ShaderBindChannelExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/ShaderErrorExtensions.cs b/AssetRipper.Core/SourceGenExtensions/ShaderErrorExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/ShaderErrorExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/ShaderErrorExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/ShaderExtensions.cs b/AssetRipper.Core/SourceGenExtensions/ShaderExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/ShaderExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/ShaderExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/ShadowSettingsExtensions.cs b/AssetRipper.Core/SourceGenExtensions/ShadowSettingsExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/ShadowSettingsExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/ShadowSettingsExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/ShapeModuleExtensions.cs b/AssetRipper.Core/SourceGenExtensions/ShapeModuleExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/ShapeModuleExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/ShapeModuleExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/SpriteAtlasDataExtensions.cs b/AssetRipper.Core/SourceGenExtensions/SpriteAtlasDataExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/SpriteAtlasDataExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/SpriteAtlasDataExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/SpriteAtlasEditorDataExtensions.cs b/AssetRipper.Core/SourceGenExtensions/SpriteAtlasEditorDataExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/SpriteAtlasEditorDataExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/SpriteAtlasEditorDataExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/SpriteAtlasExtensions.cs b/AssetRipper.Core/SourceGenExtensions/SpriteAtlasExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/SpriteAtlasExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/SpriteAtlasExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/SpriteBoneExtensions.cs b/AssetRipper.Core/SourceGenExtensions/SpriteBoneExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/SpriteBoneExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/SpriteBoneExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/SpriteExtensions.cs b/AssetRipper.Core/SourceGenExtensions/SpriteExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/SpriteExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/SpriteExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/SpriteMaskExtensions.cs b/AssetRipper.Core/SourceGenExtensions/SpriteMaskExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/SpriteMaskExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/SpriteMaskExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/SpriteMetaDataExtensions.cs b/AssetRipper.Core/SourceGenExtensions/SpriteMetaDataExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/SpriteMetaDataExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/SpriteMetaDataExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/SpriteRenderDataExtensions.cs b/AssetRipper.Core/SourceGenExtensions/SpriteRenderDataExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/SpriteRenderDataExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/SpriteRenderDataExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/SpriteRendererExtensions.cs b/AssetRipper.Core/SourceGenExtensions/SpriteRendererExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/SpriteRendererExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/SpriteRendererExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/SpriteSheetMetaDataExtensions.cs b/AssetRipper.Core/SourceGenExtensions/SpriteSheetMetaDataExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/SpriteSheetMetaDataExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/SpriteSheetMetaDataExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/StateBehavioursPairExtensions.cs b/AssetRipper.Core/SourceGenExtensions/StateBehavioursPairExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/StateBehavioursPairExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/StateBehavioursPairExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/StateConstantExtensions.cs b/AssetRipper.Core/SourceGenExtensions/StateConstantExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/StateConstantExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/StateConstantExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/StateMotionPairExtensions.cs b/AssetRipper.Core/SourceGenExtensions/StateMotionPairExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/StateMotionPairExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/StateMotionPairExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/StaticBatchInfoExtensions.cs b/AssetRipper.Core/SourceGenExtensions/StaticBatchInfoExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/StaticBatchInfoExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/StaticBatchInfoExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/StreamInfoExtensions.cs b/AssetRipper.Core/SourceGenExtensions/StreamInfoExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/StreamInfoExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/StreamInfoExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/StreamedClipExtensions.cs b/AssetRipper.Core/SourceGenExtensions/StreamedClipExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/StreamedClipExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/StreamedClipExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/StreamedResourceExtensions.cs b/AssetRipper.Core/SourceGenExtensions/StreamedResourceExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/StreamedResourceExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/StreamedResourceExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/StreamingInfoExtensions.cs b/AssetRipper.Core/SourceGenExtensions/StreamingInfoExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/StreamingInfoExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/StreamingInfoExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/SubEmitterDataExtensions.cs b/AssetRipper.Core/SourceGenExtensions/SubEmitterDataExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/SubEmitterDataExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/SubEmitterDataExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/SubMeshExtensions.cs b/AssetRipper.Core/SourceGenExtensions/SubMeshExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/SubMeshExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/SubMeshExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/TagManagerExtensions.cs b/AssetRipper.Core/SourceGenExtensions/TagManagerExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/TagManagerExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/TagManagerExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/TerrainExtensions.cs b/AssetRipper.Core/SourceGenExtensions/TerrainExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/TerrainExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/TerrainExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/TextMeshExtensions.cs b/AssetRipper.Core/SourceGenExtensions/TextMeshExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/TextMeshExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/TextMeshExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/Texture2DArrayExtensions.cs b/AssetRipper.Core/SourceGenExtensions/Texture2DArrayExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/Texture2DArrayExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/Texture2DArrayExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/Texture2DExtensions.cs b/AssetRipper.Core/SourceGenExtensions/Texture2DExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/Texture2DExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/Texture2DExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/Texture3DExtensions.cs b/AssetRipper.Core/SourceGenExtensions/Texture3DExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/Texture3DExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/Texture3DExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/TextureImporterExtensions.cs b/AssetRipper.Core/SourceGenExtensions/TextureImporterExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/TextureImporterExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/TextureImporterExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/TextureImporterPlatformSettings.cs b/AssetRipper.Core/SourceGenExtensions/TextureImporterPlatformSettings.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/TextureImporterPlatformSettings.cs
rename to AssetRipper.Core/SourceGenExtensions/TextureImporterPlatformSettings.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/TextureParameterExtensions.cs b/AssetRipper.Core/SourceGenExtensions/TextureParameterExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/TextureParameterExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/TextureParameterExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/TextureSettingsExtensions.cs b/AssetRipper.Core/SourceGenExtensions/TextureSettingsExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/TextureSettingsExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/TextureSettingsExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/TierGraphicsSettingsEditorExtensions.cs b/AssetRipper.Core/SourceGenExtensions/TierGraphicsSettingsEditorExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/TierGraphicsSettingsEditorExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/TierGraphicsSettingsEditorExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/TierGraphicsSettingsExtensions.cs b/AssetRipper.Core/SourceGenExtensions/TierGraphicsSettingsExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/TierGraphicsSettingsExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/TierGraphicsSettingsExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/TierSettingsExtensions.cs b/AssetRipper.Core/SourceGenExtensions/TierSettingsExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/TierSettingsExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/TierSettingsExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/TrailModuleExtensions.cs b/AssetRipper.Core/SourceGenExtensions/TrailModuleExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/TrailModuleExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/TrailModuleExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/TransformExtensions.cs b/AssetRipper.Core/SourceGenExtensions/TransformExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/TransformExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/TransformExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/TransitionConstantExtensions.cs b/AssetRipper.Core/SourceGenExtensions/TransitionConstantExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/TransitionConstantExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/TransitionConstantExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/TriggerModuleExtensions.cs b/AssetRipper.Core/SourceGenExtensions/TriggerModuleExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/TriggerModuleExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/TriggerModuleExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/UAVParameterExtensions.cs b/AssetRipper.Core/SourceGenExtensions/UAVParameterExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/UAVParameterExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/UAVParameterExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/UVModuleExtensions.cs b/AssetRipper.Core/SourceGenExtensions/UVModuleExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/UVModuleExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/UVModuleExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/UnityConnectSettingsExtensions.cs b/AssetRipper.Core/SourceGenExtensions/UnityConnectSettingsExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/UnityConnectSettingsExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/UnityConnectSettingsExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/UnityPropertySheetExtensions.cs b/AssetRipper.Core/SourceGenExtensions/UnityPropertySheetExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/UnityPropertySheetExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/UnityPropertySheetExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/ValueConstantExtensions.cs b/AssetRipper.Core/SourceGenExtensions/ValueConstantExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/ValueConstantExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/ValueConstantExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/VariantInfoExtensions.cs b/AssetRipper.Core/SourceGenExtensions/VariantInfoExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/VariantInfoExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/VariantInfoExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/Vector2fExtensions.cs b/AssetRipper.Core/SourceGenExtensions/Vector2fExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/Vector2fExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/Vector2fExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/Vector3CurveExtensions.cs b/AssetRipper.Core/SourceGenExtensions/Vector3CurveExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/Vector3CurveExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/Vector3CurveExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/Vector3fExtensions.cs b/AssetRipper.Core/SourceGenExtensions/Vector3fExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/Vector3fExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/Vector3fExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/Vector4fExtensions.cs b/AssetRipper.Core/SourceGenExtensions/Vector4fExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/Vector4fExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/Vector4fExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/VectorParameterExtensions.cs b/AssetRipper.Core/SourceGenExtensions/VectorParameterExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/VectorParameterExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/VectorParameterExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/VertexDataExtensions.cs b/AssetRipper.Core/SourceGenExtensions/VertexDataExtensions.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/VertexDataExtensions.cs
rename to AssetRipper.Core/SourceGenExtensions/VertexDataExtensions.cs
diff --git a/AssetRipperCommon/SourceGenExtensions/VirtualAnimationFactory.cs b/AssetRipper.Core/SourceGenExtensions/VirtualAnimationFactory.cs
similarity index 100%
rename from AssetRipperCommon/SourceGenExtensions/VirtualAnimationFactory.cs
rename to AssetRipper.Core/SourceGenExtensions/VirtualAnimationFactory.cs
diff --git a/AssetRipperCommon/Structure/GameStructure/GameStructure.cs b/AssetRipper.Core/Structure/GameStructure/GameStructure.cs
similarity index 100%
rename from AssetRipperCommon/Structure/GameStructure/GameStructure.cs
rename to AssetRipper.Core/Structure/GameStructure/GameStructure.cs
diff --git a/AssetRipperCommon/Utils/TypeTreeHelper.cs b/AssetRipper.Core/Utils/TypeTreeHelper.cs
similarity index 100%
rename from AssetRipperCommon/Utils/TypeTreeHelper.cs
rename to AssetRipper.Core/Utils/TypeTreeHelper.cs
diff --git a/AssetRipper.Tests/AssetRipper.Tests.csproj b/AssetRipper.Tests/AssetRipper.Tests.csproj
index 2f5b6d7e9..c394652c1 100644
--- a/AssetRipper.Tests/AssetRipper.Tests.csproj
+++ b/AssetRipper.Tests/AssetRipper.Tests.csproj
@@ -15,7 +15,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<ProjectReference Include="..\AssetRipperCommon\AssetRipperCommon.csproj" />
+	  <ProjectReference Include="..\AssetRipper.Core\AssetRipper.Core.csproj" />
 	</ItemGroup>
 
 </Project>
diff --git a/AssetRipper.sln b/AssetRipper.sln
index 7fb189e2a..2ad46399d 100644
--- a/AssetRipper.sln
+++ b/AssetRipper.sln
@@ -5,8 +5,6 @@ VisualStudioVersion = 17.0.31815.197
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssetRipperConsole", "AssetRipperConsole\AssetRipperConsole.csproj", "{C9583270-6D3E-4CBF-8011-A818A7D8F3DC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssetRipperCore", "AssetRipperCore\AssetRipperCore.csproj", "{CA9420F4-4B54-4727-91E6-CCE20916D795}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{825F97E7-5A2D-4D93-81AD-292F54FE2AC7}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
@@ -84,8 +82,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{E3A52FDC-1
 		docs\articles\toc.yml = docs\articles\toc.yml
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssetRipperCommon", "AssetRipperCommon\AssetRipperCommon.csproj", "{676FEE4F-6353-4D8B-B8E6-D89801D25575}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssetRipper.Tests", "AssetRipper.Tests\AssetRipper.Tests.csproj", "{365C791E-431B-40E5-B724-BE375126AA11}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ShellScripts", "ShellScripts", "{06FFA747-F995-4696-A09E-7559161EBA42}"
@@ -108,9 +104,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssetRipper.SerializationLo
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssetRipper.Yaml.Tests", "AssetRipper.Yaml.Tests\AssetRipper.Yaml.Tests.csproj", "{838B66B6-B54D-4BEE-B7E3-888E8FDE7CAE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssetRipper.IO.Endian", "AssetRipper.IO.Endian\AssetRipper.IO.Endian.csproj", "{82436B39-9077-407B-9FE6-51E1BEADB855}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssetRipper.IO.Endian", "AssetRipper.IO.Endian\AssetRipper.IO.Endian.csproj", "{82436B39-9077-407B-9FE6-51E1BEADB855}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssetRipper.IO.Files", "AssetRipper.IO.Files\AssetRipper.IO.Files.csproj", "{95684DEF-EFC1-4649-AD9E-4660DA7A584A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssetRipper.IO.Files", "AssetRipper.IO.Files\AssetRipper.IO.Files.csproj", "{95684DEF-EFC1-4649-AD9E-4660DA7A584A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssetRipper.Core", "AssetRipper.Core\AssetRipper.Core.csproj", "{AA893E5C-2431-4070-AF6A-EE638C3249D7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -134,18 +132,6 @@ Global
 		{C9583270-6D3E-4CBF-8011-A818A7D8F3DC}.ReleaseMac|x64.Build.0 = ReleaseMac|x64
 		{C9583270-6D3E-4CBF-8011-A818A7D8F3DC}.ReleaseWindows|x64.ActiveCfg = ReleaseWindows|x64
 		{C9583270-6D3E-4CBF-8011-A818A7D8F3DC}.ReleaseWindows|x64.Build.0 = ReleaseWindows|x64
-		{CA9420F4-4B54-4727-91E6-CCE20916D795}.DebugLinux|x64.ActiveCfg = Debug|Any CPU
-		{CA9420F4-4B54-4727-91E6-CCE20916D795}.DebugLinux|x64.Build.0 = Debug|Any CPU
-		{CA9420F4-4B54-4727-91E6-CCE20916D795}.DebugMac|x64.ActiveCfg = Debug|Any CPU
-		{CA9420F4-4B54-4727-91E6-CCE20916D795}.DebugMac|x64.Build.0 = Debug|Any CPU
-		{CA9420F4-4B54-4727-91E6-CCE20916D795}.DebugWindows|x64.ActiveCfg = Debug|Any CPU
-		{CA9420F4-4B54-4727-91E6-CCE20916D795}.DebugWindows|x64.Build.0 = Debug|Any CPU
-		{CA9420F4-4B54-4727-91E6-CCE20916D795}.ReleaseLinux|x64.ActiveCfg = Release|Any CPU
-		{CA9420F4-4B54-4727-91E6-CCE20916D795}.ReleaseLinux|x64.Build.0 = Release|Any CPU
-		{CA9420F4-4B54-4727-91E6-CCE20916D795}.ReleaseMac|x64.ActiveCfg = Release|Any CPU
-		{CA9420F4-4B54-4727-91E6-CCE20916D795}.ReleaseMac|x64.Build.0 = Release|Any CPU
-		{CA9420F4-4B54-4727-91E6-CCE20916D795}.ReleaseWindows|x64.ActiveCfg = Release|Any CPU
-		{CA9420F4-4B54-4727-91E6-CCE20916D795}.ReleaseWindows|x64.Build.0 = Release|Any CPU
 		{36C3C081-547B-4C0C-98D0-BB90BA07B976}.DebugLinux|x64.ActiveCfg = DebugLinux|x64
 		{36C3C081-547B-4C0C-98D0-BB90BA07B976}.DebugLinux|x64.Build.0 = DebugLinux|x64
 		{36C3C081-547B-4C0C-98D0-BB90BA07B976}.DebugMac|x64.ActiveCfg = DebugMac|x64
@@ -194,18 +180,6 @@ Global
 		{8CDB3DC9-77D2-4295-BB04-CEA24CA59B93}.ReleaseMac|x64.Build.0 = ReleaseMac|x64
 		{8CDB3DC9-77D2-4295-BB04-CEA24CA59B93}.ReleaseWindows|x64.ActiveCfg = ReleaseWindows|x64
 		{8CDB3DC9-77D2-4295-BB04-CEA24CA59B93}.ReleaseWindows|x64.Build.0 = ReleaseWindows|x64
-		{676FEE4F-6353-4D8B-B8E6-D89801D25575}.DebugLinux|x64.ActiveCfg = Debug|Any CPU
-		{676FEE4F-6353-4D8B-B8E6-D89801D25575}.DebugLinux|x64.Build.0 = Debug|Any CPU
-		{676FEE4F-6353-4D8B-B8E6-D89801D25575}.DebugMac|x64.ActiveCfg = Debug|Any CPU
-		{676FEE4F-6353-4D8B-B8E6-D89801D25575}.DebugMac|x64.Build.0 = Debug|Any CPU
-		{676FEE4F-6353-4D8B-B8E6-D89801D25575}.DebugWindows|x64.ActiveCfg = Debug|Any CPU
-		{676FEE4F-6353-4D8B-B8E6-D89801D25575}.DebugWindows|x64.Build.0 = Debug|Any CPU
-		{676FEE4F-6353-4D8B-B8E6-D89801D25575}.ReleaseLinux|x64.ActiveCfg = Release|Any CPU
-		{676FEE4F-6353-4D8B-B8E6-D89801D25575}.ReleaseLinux|x64.Build.0 = Release|Any CPU
-		{676FEE4F-6353-4D8B-B8E6-D89801D25575}.ReleaseMac|x64.ActiveCfg = Release|Any CPU
-		{676FEE4F-6353-4D8B-B8E6-D89801D25575}.ReleaseMac|x64.Build.0 = Release|Any CPU
-		{676FEE4F-6353-4D8B-B8E6-D89801D25575}.ReleaseWindows|x64.ActiveCfg = Release|Any CPU
-		{676FEE4F-6353-4D8B-B8E6-D89801D25575}.ReleaseWindows|x64.Build.0 = Release|Any CPU
 		{365C791E-431B-40E5-B724-BE375126AA11}.DebugLinux|x64.ActiveCfg = Debug|Any CPU
 		{365C791E-431B-40E5-B724-BE375126AA11}.DebugLinux|x64.Build.0 = Debug|Any CPU
 		{365C791E-431B-40E5-B724-BE375126AA11}.DebugMac|x64.ActiveCfg = Debug|Any CPU
@@ -326,6 +300,18 @@ Global
 		{95684DEF-EFC1-4649-AD9E-4660DA7A584A}.ReleaseMac|x64.Build.0 = Release|Any CPU
 		{95684DEF-EFC1-4649-AD9E-4660DA7A584A}.ReleaseWindows|x64.ActiveCfg = Release|Any CPU
 		{95684DEF-EFC1-4649-AD9E-4660DA7A584A}.ReleaseWindows|x64.Build.0 = Release|Any CPU
+		{AA893E5C-2431-4070-AF6A-EE638C3249D7}.DebugLinux|x64.ActiveCfg = Debug|Any CPU
+		{AA893E5C-2431-4070-AF6A-EE638C3249D7}.DebugLinux|x64.Build.0 = Debug|Any CPU
+		{AA893E5C-2431-4070-AF6A-EE638C3249D7}.DebugMac|x64.ActiveCfg = Debug|Any CPU
+		{AA893E5C-2431-4070-AF6A-EE638C3249D7}.DebugMac|x64.Build.0 = Debug|Any CPU
+		{AA893E5C-2431-4070-AF6A-EE638C3249D7}.DebugWindows|x64.ActiveCfg = Debug|Any CPU
+		{AA893E5C-2431-4070-AF6A-EE638C3249D7}.DebugWindows|x64.Build.0 = Debug|Any CPU
+		{AA893E5C-2431-4070-AF6A-EE638C3249D7}.ReleaseLinux|x64.ActiveCfg = Release|Any CPU
+		{AA893E5C-2431-4070-AF6A-EE638C3249D7}.ReleaseLinux|x64.Build.0 = Release|Any CPU
+		{AA893E5C-2431-4070-AF6A-EE638C3249D7}.ReleaseMac|x64.ActiveCfg = Release|Any CPU
+		{AA893E5C-2431-4070-AF6A-EE638C3249D7}.ReleaseMac|x64.Build.0 = Release|Any CPU
+		{AA893E5C-2431-4070-AF6A-EE638C3249D7}.ReleaseWindows|x64.ActiveCfg = Release|Any CPU
+		{AA893E5C-2431-4070-AF6A-EE638C3249D7}.ReleaseWindows|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/AssetRipperCommon/AssetRipperCommon.csproj b/AssetRipperCommon/AssetRipperCommon.csproj
deleted file mode 100644
index 799c6d88f..000000000
--- a/AssetRipperCommon/AssetRipperCommon.csproj
+++ /dev/null
@@ -1,51 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
-		<Nullable>enable</Nullable>
-		<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
-		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-		<OutputPath>..\Bins\AssetRipperCommon\$(Configuration)\</OutputPath>
-		<IntermediateOutputPath>..\Bins\obj\AssetRipperCommon\$(Configuration)\</IntermediateOutputPath>
-		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-		<AssemblyName>AssetRipperCommon</AssemblyName>
-		<RootNamespace>AssetRipper.Core</RootNamespace>
-		<Copyright>Copyright ©  2022</Copyright>
-		<Authors>ds5678</Authors>
-		<Configurations>Debug;Release</Configurations>
-		<DebugType>embedded</DebugType>
-		<DebugSymbols>true</DebugSymbols>
-		<DefineConstants>TRACE;NET_CORE</DefineConstants>
-		<IsTrimmable>true</IsTrimmable>
-	</PropertyGroup>
-
-	<PropertyGroup Condition="'$(Configuration)'=='Debug'">
-		<DefineConstants>DEBUG</DefineConstants>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<PackageReference Include="AssetRipper.VersionUtilities" Version="1.2.1" />
-		<PackageReference Include="K4os.Compression.LZ4" Version="1.2.16" />
-		<PackageReference Include="Mono.Cecil" Version="0.11.4" />
-		<PackageReference Include="Samboy063.Cpp2IL.Core" Version="2022.0.5" />
-		<PackageReference Include="SharpCompress" Version="0.32.1" />
-		<PackageReference Include="SharpZipLib" Version="1.3.3" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<Reference Include="AssetRipper.SourceGenerated">
-			<SpecificVersion>False</SpecificVersion>
-			<HintPath>../Libraries/AssetRipper.SourceGenerated.dll</HintPath>
-		</Reference>
-	</ItemGroup>
-
-	<ItemGroup>
-	  <ProjectReference Include="..\AssetRipper.Fundamentals\AssetRipper.Fundamentals.csproj" />
-	  <ProjectReference Include="..\AssetRipper.Yaml\AssetRipper.Yaml.csproj" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<RuntimeHostConfigurationOption Include="System.Globalization.Invariant" Value="true" />
-	</ItemGroup>
-
-</Project>
diff --git a/AssetRipperCommon/Properties/AssemblyInfo.cs b/AssetRipperCommon/Properties/AssemblyInfo.cs
deleted file mode 100644
index f542ae667..000000000
--- a/AssetRipperCommon/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle(AssetRipper.Core.BuildInfo.CommonName)]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany(AssetRipper.Core.BuildInfo.Author)]
-[assembly: AssemblyProduct(AssetRipper.Core.BuildInfo.CommonName)]
-[assembly: AssemblyCopyright(AssetRipper.Core.BuildInfo.CopyRight)]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-[assembly: ComVisible(false)]
-
-[assembly: AssemblyVersion(AssetRipper.Core.BuildInfo.Version)]
-[assembly: AssemblyFileVersion(AssetRipper.Core.BuildInfo.Version)]
-
-[assembly: InternalsVisibleTo("AssetRipperCore")]
\ No newline at end of file
diff --git a/AssetRipperCore/Directory.Build.props b/AssetRipperCore/Directory.Build.props
deleted file mode 100644
index 46982e240..000000000
--- a/AssetRipperCore/Directory.Build.props
+++ /dev/null
@@ -1,7 +0,0 @@
-<Project>
-
-  <PropertyGroup>
-	<BaseIntermediateOutputPath>..\Bins\obj\standard\</BaseIntermediateOutputPath>
-  </PropertyGroup>
-  
-</Project>
\ No newline at end of file
diff --git a/AssetRipperCore/GlobalUsings.cs b/AssetRipperCore/GlobalUsings.cs
deleted file mode 100644
index 67cafcf3d..000000000
--- a/AssetRipperCore/GlobalUsings.cs
+++ /dev/null
@@ -1,2 +0,0 @@
-global using AssetRipper.VersionUtilities;
-global using System;
diff --git a/AssetRipperGUI/AssetRipperGUI.csproj b/AssetRipperGUI/AssetRipperGUI.csproj
index f46865805..0e5be4364 100644
--- a/AssetRipperGUI/AssetRipperGUI.csproj
+++ b/AssetRipperGUI/AssetRipperGUI.csproj
@@ -56,7 +56,6 @@
 		<PackageReference Include="VideoLAN.LibVLC.Mac" Version="3.1.3.1" />
 	</ItemGroup>
 	<ItemGroup>
-		<ProjectReference Include="..\AssetRipperCore\AssetRipperCore.csproj" />
 		<ProjectReference Include="..\AssetRipperLibrary\AssetRipperLibrary.csproj" />
 	</ItemGroup>
 	<ItemGroup>
diff --git a/AssetRipperLibrary/AssetRipperLibrary.csproj b/AssetRipperLibrary/AssetRipperLibrary.csproj
index fbb524be9..f890e4670 100644
--- a/AssetRipperLibrary/AssetRipperLibrary.csproj
+++ b/AssetRipperLibrary/AssetRipperLibrary.csproj
@@ -69,7 +69,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<ProjectReference Include="..\AssetRipperCore\AssetRipperCore.csproj" />
+		<ProjectReference Include="..\AssetRipper.Core\AssetRipper.Core.csproj" />
 		<ProjectReference Include="..\ShaderTextRestorer\ShaderTextRestorer.csproj" />
 	</ItemGroup>
 
diff --git a/ShaderTextRestorer/ShaderTextRestorer.csproj b/ShaderTextRestorer/ShaderTextRestorer.csproj
index 4db2d4ec2..d9ac1450a 100644
--- a/ShaderTextRestorer/ShaderTextRestorer.csproj
+++ b/ShaderTextRestorer/ShaderTextRestorer.csproj
@@ -28,7 +28,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<ProjectReference Include="..\AssetRipperCore\AssetRipperCore.csproj" />
+		<ProjectReference Include="..\AssetRipper.Core\AssetRipper.Core.csproj" />
 		<ProjectReference Include="..\Smolv\Smolv.csproj" />
 		<ProjectReference Include="..\SpirV\SpirV.csproj" />
 	</ItemGroup>
diff --git a/docs/articles/RoadMap.md b/docs/articles/RoadMap.md
index d367ea21b..c1274ac86 100644
--- a/docs/articles/RoadMap.md
+++ b/docs/articles/RoadMap.md
@@ -6,7 +6,7 @@ This release will be primarily focused on cleaning up and refactoring the projec
 * Cleanup legacy code
   * ~~Remove the `Classes` and `Converters` namespaces~~
   * ~~Remove any additional legacy code~~
-  * Merge the common project back into the core project
+  * ~~Merge the common project back into the core project~~
 
 ## 0.2.X.0
 These releases will likely focus on preparing for the next major milestone.