diff --git a/Models/322KTrisMap.mtrl b/Models/322KTrisMap.mtrl
deleted file mode 100644
index cd59223..0000000
Binary files a/Models/322KTrisMap.mtrl and /dev/null differ
diff --git a/Models/322kTrisMap.mesh b/Models/322kTrisMap.mesh
deleted file mode 100644
index 2478da4..0000000
Binary files a/Models/322kTrisMap.mesh and /dev/null differ
diff --git a/Models/AssaultAnimTest.anim b/Models/AssaultAnimTest.anim
deleted file mode 100644
index 7ee1b95..0000000
Binary files a/Models/AssaultAnimTest.anim and /dev/null differ
diff --git a/Models/AssaultAnimTest.mesh b/Models/AssaultAnimTest.mesh
deleted file mode 100644
index 6c4b5b6..0000000
Binary files a/Models/AssaultAnimTest.mesh and /dev/null differ
diff --git a/Models/AssaultAnimTest.mtrl b/Models/AssaultAnimTest.mtrl
deleted file mode 100644
index 8ba0931..0000000
Binary files a/Models/AssaultAnimTest.mtrl and /dev/null differ
diff --git a/Models/Body.mesh b/Models/Body.mesh
deleted file mode 100644
index c035e45..0000000
Binary files a/Models/Body.mesh and /dev/null differ
diff --git a/Models/Body.mtrl b/Models/Body.mtrl
deleted file mode 100644
index 1fb54fa..0000000
Binary files a/Models/Body.mtrl and /dev/null differ
diff --git a/Models/CapturPoint.mesh b/Models/CapturPoint.mesh
deleted file mode 100644
index 697f33d..0000000
Binary files a/Models/CapturPoint.mesh and /dev/null differ
diff --git a/Models/CapturPoint.mtrl b/Models/CapturPoint.mtrl
deleted file mode 100644
index 4953243..0000000
Binary files a/Models/CapturPoint.mtrl and /dev/null differ
diff --git a/Models/AssaultAnimated.anim b/Models/Characters/Assault/AssaultAnimated.anim
similarity index 100%
rename from Models/AssaultAnimated.anim
rename to Models/Characters/Assault/AssaultAnimated.anim
diff --git a/Models/AssaultAnimated.mesh b/Models/Characters/Assault/AssaultAnimated.mesh
similarity index 100%
rename from Models/AssaultAnimated.mesh
rename to Models/Characters/Assault/AssaultAnimated.mesh
diff --git a/Models/AssaultAnimated.mtrl b/Models/Characters/Assault/AssaultAnimated.mtrl
similarity index 100%
rename from Models/AssaultAnimated.mtrl
rename to Models/Characters/Assault/AssaultAnimated.mtrl
diff --git a/Models/AssaultHeadless.mesh b/Models/Characters/Assault/AssaultHeadless.mesh
similarity index 100%
rename from Models/AssaultHeadless.mesh
rename to Models/Characters/Assault/AssaultHeadless.mesh
diff --git a/Models/AssaultHeadless.mtrl b/Models/Characters/Assault/AssaultHeadless.mtrl
similarity index 100%
rename from Models/AssaultHeadless.mtrl
rename to Models/Characters/Assault/AssaultHeadless.mtrl
diff --git a/Models/Assault.mesh b/Models/Characters/Assault/AssaultTPose.mesh
similarity index 100%
rename from Models/Assault.mesh
rename to Models/Characters/Assault/AssaultTPose.mesh
diff --git a/Models/Assault.mtrl b/Models/Characters/Assault/AssaultTPose.mtrl
similarity index 100%
rename from Models/Assault.mtrl
rename to Models/Characters/Assault/AssaultTPose.mtrl
diff --git a/Models/DirectionalLight.mesh b/Models/DirectionalLight.mesh
deleted file mode 100644
index bc4c6e3..0000000
Binary files a/Models/DirectionalLight.mesh and /dev/null differ
diff --git a/Models/DirectionalLight.mtrl b/Models/DirectionalLight.mtrl
deleted file mode 100644
index 5cfb74b..0000000
Binary files a/Models/DirectionalLight.mtrl and /dev/null differ
diff --git a/Models/JumpEffectHexagon.mesh b/Models/Effects/JumpEffectHexagon.mesh
similarity index 100%
rename from Models/JumpEffectHexagon.mesh
rename to Models/Effects/JumpEffectHexagon.mesh
diff --git a/Models/JumpEffectHexagon.mtrl b/Models/Effects/JumpEffectHexagon.mtrl
similarity index 100%
rename from Models/JumpEffectHexagon.mtrl
rename to Models/Effects/JumpEffectHexagon.mtrl
diff --git a/Models/MapVersion1.mesh b/Models/LevelBase/MapVersion1.mesh
similarity index 100%
rename from Models/MapVersion1.mesh
rename to Models/LevelBase/MapVersion1.mesh
diff --git a/Models/MapVersion1.mtrl b/Models/LevelBase/MapVersion1.mtrl
similarity index 100%
rename from Models/MapVersion1.mtrl
rename to Models/LevelBase/MapVersion1.mtrl
diff --git a/Models/BushAlive.mesh b/Models/Props/BushAlive.mesh
similarity index 100%
rename from Models/BushAlive.mesh
rename to Models/Props/BushAlive.mesh
diff --git a/Models/BushAlive.mtrl b/Models/Props/BushAlive.mtrl
similarity index 100%
rename from Models/BushAlive.mtrl
rename to Models/Props/BushAlive.mtrl
diff --git a/Models/CapturePoint.mesh b/Models/Props/CapturePoint.mesh
similarity index 100%
rename from Models/CapturePoint.mesh
rename to Models/Props/CapturePoint.mesh
diff --git a/Models/CapturePoint.mtrl b/Models/Props/CapturePoint.mtrl
similarity index 100%
rename from Models/CapturePoint.mtrl
rename to Models/Props/CapturePoint.mtrl
diff --git a/Models/Log.mesh b/Models/Props/TreeLog.mesh
similarity index 100%
rename from Models/Log.mesh
rename to Models/Props/TreeLog.mesh
diff --git a/Models/Log.mtrl b/Models/Props/TreeLog.mtrl
similarity index 100%
rename from Models/Log.mtrl
rename to Models/Props/TreeLog.mtrl
diff --git a/Models/TankWeapon.mesh b/Models/TankWeapon.mesh
deleted file mode 100644
index f7abeab..0000000
Binary files a/Models/TankWeapon.mesh and /dev/null differ
diff --git a/Models/TankWeapon.mtrl b/Models/TankWeapon.mtrl
deleted file mode 100644
index e1874d0..0000000
Binary files a/Models/TankWeapon.mtrl and /dev/null differ
diff --git a/Models/animTest.anim b/Models/Test/AnimTest.anim
similarity index 100%
rename from Models/animTest.anim
rename to Models/Test/AnimTest.anim
diff --git a/Models/animTest.mesh b/Models/Test/AnimTest.mesh
similarity index 100%
rename from Models/animTest.mesh
rename to Models/Test/AnimTest.mesh
diff --git a/Models/animTest.mtrl b/Models/Test/AnimTest.mtrl
similarity index 100%
rename from Models/animTest.mtrl
rename to Models/Test/AnimTest.mtrl
diff --git a/Models/Assualt.mesh b/Models/Test/AssaultTPoseHardEdge.mesh
similarity index 100%
rename from Models/Assualt.mesh
rename to Models/Test/AssaultTPoseHardEdge.mesh
diff --git a/Models/Assualt.mtrl b/Models/Test/AssaultTPoseHardEdge.mtrl
similarity index 100%
rename from Models/Assualt.mtrl
rename to Models/Test/AssaultTPoseHardEdge.mtrl
diff --git a/Models/AssualtSoft.mesh b/Models/Test/AssaultTPoseSoftEdge.mesh
similarity index 100%
rename from Models/AssualtSoft.mesh
rename to Models/Test/AssaultTPoseSoftEdge.mesh
diff --git a/Models/AssualtSoft.mtrl b/Models/Test/AssaultTPoseSoftEdge.mtrl
similarity index 100%
rename from Models/AssualtSoft.mtrl
rename to Models/Test/AssaultTPoseSoftEdge.mtrl
diff --git a/Models/DummyScene.mesh b/Models/Test/DummyScene.mesh
similarity index 100%
rename from Models/DummyScene.mesh
rename to Models/Test/DummyScene.mesh
diff --git a/Models/DummyScene.mtrl b/Models/Test/DummyScene.mtrl
similarity index 100%
rename from Models/DummyScene.mtrl
rename to Models/Test/DummyScene.mtrl
diff --git a/Models/IncandescenceMapSphere.mesh b/Models/Test/IncandescenceMapSphere.mesh
similarity index 100%
rename from Models/IncandescenceMapSphere.mesh
rename to Models/Test/IncandescenceMapSphere.mesh
diff --git a/Models/IncandescenceMapSphere.mtrl b/Models/Test/IncandescenceMapSphere.mtrl
similarity index 100%
rename from Models/IncandescenceMapSphere.mtrl
rename to Models/Test/IncandescenceMapSphere.mtrl
diff --git a/Models/NormSpecIncdMapSphere.mesh b/Models/Test/NormSpecIncdMapSphere.mesh
similarity index 100%
rename from Models/NormSpecIncdMapSphere.mesh
rename to Models/Test/NormSpecIncdMapSphere.mesh
diff --git a/Models/NormSpecIncdMapSphere.mtrl b/Models/Test/NormSpecIncdMapSphere.mtrl
similarity index 100%
rename from Models/NormSpecIncdMapSphere.mtrl
rename to Models/Test/NormSpecIncdMapSphere.mtrl
diff --git a/Models/NormalMapSphere.mesh b/Models/Test/NormalMapSphere.mesh
similarity index 100%
rename from Models/NormalMapSphere.mesh
rename to Models/Test/NormalMapSphere.mesh
diff --git a/Models/NormalMapSphere.mtrl b/Models/Test/NormalMapSphere.mtrl
similarity index 100%
rename from Models/NormalMapSphere.mtrl
rename to Models/Test/NormalMapSphere.mtrl
diff --git a/Models/SpecularMapSphere.mesh b/Models/Test/SpecularMapSphere.mesh
similarity index 100%
rename from Models/SpecularMapSphere.mesh
rename to Models/Test/SpecularMapSphere.mesh
diff --git a/Models/SpecularMapSphere.mtrl b/Models/Test/SpecularMapSphere.mtrl
similarity index 100%
rename from Models/SpecularMapSphere.mtrl
rename to Models/Test/SpecularMapSphere.mtrl
diff --git a/Models/testCube.mesh b/Models/Test/testCube.mesh
similarity index 100%
rename from Models/testCube.mesh
rename to Models/Test/testCube.mesh
diff --git a/Models/testCube.mtrl b/Models/Test/testCube.mtrl
similarity index 100%
rename from Models/testCube.mtrl
rename to Models/Test/testCube.mtrl
diff --git a/Models/AssaultWeaponBlue.mesh b/Models/Weapons/Blue/AssaultWeaponBlue.mesh
similarity index 100%
rename from Models/AssaultWeaponBlue.mesh
rename to Models/Weapons/Blue/AssaultWeaponBlue.mesh
diff --git a/Models/AssaultWeaponBlue.mtrl b/Models/Weapons/Blue/AssaultWeaponBlue.mtrl
similarity index 100%
rename from Models/AssaultWeaponBlue.mtrl
rename to Models/Weapons/Blue/AssaultWeaponBlue.mtrl
diff --git a/Models/DefenderGunBlue.mesh b/Models/Weapons/Blue/DefenderGunBlue.mesh
similarity index 100%
rename from Models/DefenderGunBlue.mesh
rename to Models/Weapons/Blue/DefenderGunBlue.mesh
diff --git a/Models/DefenderGunBlue.mtrl b/Models/Weapons/Blue/DefenderGunBlue.mtrl
similarity index 100%
rename from Models/DefenderGunBlue.mtrl
rename to Models/Weapons/Blue/DefenderGunBlue.mtrl
diff --git a/Models/CrosshairQuad.mesh b/Models/Weapons/CrosshairQuad.mesh
similarity index 100%
rename from Models/CrosshairQuad.mesh
rename to Models/Weapons/CrosshairQuad.mesh
diff --git a/Models/CrosshairQuad.mtrl b/Models/Weapons/CrosshairQuad.mtrl
similarity index 100%
rename from Models/CrosshairQuad.mtrl
rename to Models/Weapons/CrosshairQuad.mtrl
diff --git a/Models/CylinderBullet.mesh b/Models/Weapons/CylinderBullet.mesh
similarity index 100%
rename from Models/CylinderBullet.mesh
rename to Models/Weapons/CylinderBullet.mesh
diff --git a/Models/CylinderBullet.mtrl b/Models/Weapons/CylinderBullet.mtrl
similarity index 100%
rename from Models/CylinderBullet.mtrl
rename to Models/Weapons/CylinderBullet.mtrl
diff --git a/Models/AssaultWeaponRed.mesh b/Models/Weapons/Red/AssaultWeaponRed.mesh
similarity index 100%
rename from Models/AssaultWeaponRed.mesh
rename to Models/Weapons/Red/AssaultWeaponRed.mesh
diff --git a/Models/AssaultWeaponRed.mtrl b/Models/Weapons/Red/AssaultWeaponRed.mtrl
similarity index 100%
rename from Models/AssaultWeaponRed.mtrl
rename to Models/Weapons/Red/AssaultWeaponRed.mtrl
diff --git a/Models/DefenderGunRed.mesh b/Models/Weapons/Red/DefenderGunRed.mesh
similarity index 100%
rename from Models/DefenderGunRed.mesh
rename to Models/Weapons/Red/DefenderGunRed.mesh
diff --git a/Models/DefenderGunRed.mtrl b/Models/Weapons/Red/DefenderGunRed.mtrl
similarity index 100%
rename from Models/DefenderGunRed.mtrl
rename to Models/Weapons/Red/DefenderGunRed.mtrl
diff --git a/Models/SecondaryWeapon.mesh b/Models/Weapons/SecondaryWeapon.mesh
similarity index 100%
rename from Models/SecondaryWeapon.mesh
rename to Models/Weapons/SecondaryWeapon.mesh
diff --git a/Models/SecondaryWeapon.mtrl b/Models/Weapons/SecondaryWeapon.mtrl
similarity index 100%
rename from Models/SecondaryWeapon.mtrl
rename to Models/Weapons/SecondaryWeapon.mtrl
diff --git a/Models/Camera.mesh b/Models/Widgets/Camera.mesh
similarity index 100%
rename from Models/Camera.mesh
rename to Models/Widgets/Camera.mesh
diff --git a/Models/Camera.mtrl b/Models/Widgets/Camera.mtrl
similarity index 100%
rename from Models/Camera.mtrl
rename to Models/Widgets/Camera.mtrl
diff --git a/Models/DirectionalLightWidget.mesh b/Models/Widgets/Lights/DirectionalLightWidget.mesh
similarity index 100%
rename from Models/DirectionalLightWidget.mesh
rename to Models/Widgets/Lights/DirectionalLightWidget.mesh
diff --git a/Models/DirectionalLightWidget.mtrl b/Models/Widgets/Lights/DirectionalLightWidget.mtrl
similarity index 100%
rename from Models/DirectionalLightWidget.mtrl
rename to Models/Widgets/Lights/DirectionalLightWidget.mtrl
diff --git a/Models/Hourglasses/HourGlass1.mesh b/Models/Widgets/Loading/HourGlass1.mesh
similarity index 100%
rename from Models/Hourglasses/HourGlass1.mesh
rename to Models/Widgets/Loading/HourGlass1.mesh
diff --git a/Models/Hourglasses/HourGlass1.mtrl b/Models/Widgets/Loading/HourGlass1.mtrl
similarity index 100%
rename from Models/Hourglasses/HourGlass1.mtrl
rename to Models/Widgets/Loading/HourGlass1.mtrl
diff --git a/Models/Hourglasses/HourGlass2.mesh b/Models/Widgets/Loading/HourGlass2.mesh
similarity index 100%
rename from Models/Hourglasses/HourGlass2.mesh
rename to Models/Widgets/Loading/HourGlass2.mesh
diff --git a/Models/Hourglasses/HourGlass2.mtrl b/Models/Widgets/Loading/HourGlass2.mtrl
similarity index 100%
rename from Models/Hourglasses/HourGlass2.mtrl
rename to Models/Widgets/Loading/HourGlass2.mtrl
diff --git a/Models/Hourglasses/HourGlass3.mesh b/Models/Widgets/Loading/HourGlass3.mesh
similarity index 100%
rename from Models/Hourglasses/HourGlass3.mesh
rename to Models/Widgets/Loading/HourGlass3.mesh
diff --git a/Models/Hourglasses/HourGlass3.mtrl b/Models/Widgets/Loading/HourGlass3.mtrl
similarity index 100%
rename from Models/Hourglasses/HourGlass3.mtrl
rename to Models/Widgets/Loading/HourGlass3.mtrl
diff --git a/Models/Hourglasses/Hourglass4.mesh b/Models/Widgets/Loading/Hourglass4.mesh
similarity index 100%
rename from Models/Hourglasses/Hourglass4.mesh
rename to Models/Widgets/Loading/Hourglass4.mesh
diff --git a/Models/Hourglasses/Hourglass4.mtrl b/Models/Widgets/Loading/Hourglass4.mtrl
similarity index 100%
rename from Models/Hourglasses/Hourglass4.mtrl
rename to Models/Widgets/Loading/Hourglass4.mtrl
diff --git a/Models/Hourglasses/Hourglass5.mesh b/Models/Widgets/Loading/Hourglass5.mesh
similarity index 100%
rename from Models/Hourglasses/Hourglass5.mesh
rename to Models/Widgets/Loading/Hourglass5.mesh
diff --git a/Models/Hourglasses/Hourglass5.mtrl b/Models/Widgets/Loading/Hourglass5.mtrl
similarity index 100%
rename from Models/Hourglasses/Hourglass5.mtrl
rename to Models/Widgets/Loading/Hourglass5.mtrl
diff --git a/Models/Hourglasses/Hourglass6.mesh b/Models/Widgets/Loading/Hourglass6.mesh
similarity index 100%
rename from Models/Hourglasses/Hourglass6.mesh
rename to Models/Widgets/Loading/Hourglass6.mesh
diff --git a/Models/Hourglasses/Hourglass6.mtrl b/Models/Widgets/Loading/Hourglass6.mtrl
similarity index 100%
rename from Models/Hourglasses/Hourglass6.mtrl
rename to Models/Widgets/Loading/Hourglass6.mtrl
diff --git a/Models/Hourglasses/Hourglass7.mesh b/Models/Widgets/Loading/Hourglass7.mesh
similarity index 100%
rename from Models/Hourglasses/Hourglass7.mesh
rename to Models/Widgets/Loading/Hourglass7.mesh
diff --git a/Models/Hourglasses/Hourglass7.mtrl b/Models/Widgets/Loading/Hourglass7.mtrl
similarity index 100%
rename from Models/Hourglasses/Hourglass7.mtrl
rename to Models/Widgets/Loading/Hourglass7.mtrl
diff --git a/Models/RotationWidgetX.mesh b/Models/Widgets/Rotate/RotationWidgetX.mesh
similarity index 100%
rename from Models/RotationWidgetX.mesh
rename to Models/Widgets/Rotate/RotationWidgetX.mesh
diff --git a/Models/RotationWidgetX.mtrl b/Models/Widgets/Rotate/RotationWidgetX.mtrl
similarity index 100%
rename from Models/RotationWidgetX.mtrl
rename to Models/Widgets/Rotate/RotationWidgetX.mtrl
diff --git a/Models/RotationWidgetY.mesh b/Models/Widgets/Rotate/RotationWidgetY.mesh
similarity index 100%
rename from Models/RotationWidgetY.mesh
rename to Models/Widgets/Rotate/RotationWidgetY.mesh
diff --git a/Models/RotationWidgetY.mtrl b/Models/Widgets/Rotate/RotationWidgetY.mtrl
similarity index 100%
rename from Models/RotationWidgetY.mtrl
rename to Models/Widgets/Rotate/RotationWidgetY.mtrl
diff --git a/Models/RotationWidgetZ.mesh b/Models/Widgets/Rotate/RotationWidgetZ.mesh
similarity index 100%
rename from Models/RotationWidgetZ.mesh
rename to Models/Widgets/Rotate/RotationWidgetZ.mesh
diff --git a/Models/RotationWidgetZ.mtrl b/Models/Widgets/Rotate/RotationWidgetZ.mtrl
similarity index 100%
rename from Models/RotationWidgetZ.mtrl
rename to Models/Widgets/Rotate/RotationWidgetZ.mtrl
diff --git a/Models/ScaleWidgetOrigin.mesh b/Models/Widgets/Scale/ScalingWidgetOrigin.mesh
similarity index 100%
rename from Models/ScaleWidgetOrigin.mesh
rename to Models/Widgets/Scale/ScalingWidgetOrigin.mesh
diff --git a/Models/ScaleWidgetOrigin.mtrl b/Models/Widgets/Scale/ScalingWidgetOrigin.mtrl
similarity index 100%
rename from Models/ScaleWidgetOrigin.mtrl
rename to Models/Widgets/Scale/ScalingWidgetOrigin.mtrl
diff --git a/Models/ScaleWidgetX.mesh b/Models/Widgets/Scale/ScalingWidgetX.mesh
similarity index 100%
rename from Models/ScaleWidgetX.mesh
rename to Models/Widgets/Scale/ScalingWidgetX.mesh
diff --git a/Models/ScaleWidgetX.mtrl b/Models/Widgets/Scale/ScalingWidgetX.mtrl
similarity index 100%
rename from Models/ScaleWidgetX.mtrl
rename to Models/Widgets/Scale/ScalingWidgetX.mtrl
diff --git a/Models/ScaleWidgetY.mesh b/Models/Widgets/Scale/ScalingWidgetY.mesh
similarity index 100%
rename from Models/ScaleWidgetY.mesh
rename to Models/Widgets/Scale/ScalingWidgetY.mesh
diff --git a/Models/ScaleWidgetY.mtrl b/Models/Widgets/Scale/ScalingWidgetY.mtrl
similarity index 100%
rename from Models/ScaleWidgetY.mtrl
rename to Models/Widgets/Scale/ScalingWidgetY.mtrl
diff --git a/Models/ScaleWidgetZ.mesh b/Models/Widgets/Scale/ScalingWidgetZ.mesh
similarity index 100%
rename from Models/ScaleWidgetZ.mesh
rename to Models/Widgets/Scale/ScalingWidgetZ.mesh
diff --git a/Models/ScaleWidgetZ.mtrl b/Models/Widgets/Scale/ScalingWidgetZ.mtrl
similarity index 100%
rename from Models/ScaleWidgetZ.mtrl
rename to Models/Widgets/Scale/ScalingWidgetZ.mtrl
diff --git a/Models/TranslationWidgetOrigin.mesh b/Models/Widgets/Translate/TranslationWidgetOrigin.mesh
similarity index 100%
rename from Models/TranslationWidgetOrigin.mesh
rename to Models/Widgets/Translate/TranslationWidgetOrigin.mesh
diff --git a/Models/TranslationWidgetOrigin.mtrl b/Models/Widgets/Translate/TranslationWidgetOrigin.mtrl
similarity index 100%
rename from Models/TranslationWidgetOrigin.mtrl
rename to Models/Widgets/Translate/TranslationWidgetOrigin.mtrl
diff --git a/Models/WidgetPlaneX.mesh b/Models/Widgets/Translate/TranslationWidgetPlaneX.mesh
similarity index 100%
rename from Models/WidgetPlaneX.mesh
rename to Models/Widgets/Translate/TranslationWidgetPlaneX.mesh
diff --git a/Models/WidgetPlaneX.mtrl b/Models/Widgets/Translate/TranslationWidgetPlaneX.mtrl
similarity index 100%
rename from Models/WidgetPlaneX.mtrl
rename to Models/Widgets/Translate/TranslationWidgetPlaneX.mtrl
diff --git a/Models/WidgetPlaneY.mesh b/Models/Widgets/Translate/TranslationWidgetPlaneY.mesh
similarity index 100%
rename from Models/WidgetPlaneY.mesh
rename to Models/Widgets/Translate/TranslationWidgetPlaneY.mesh
diff --git a/Models/WidgetPlaneY.mtrl b/Models/Widgets/Translate/TranslationWidgetPlaneY.mtrl
similarity index 100%
rename from Models/WidgetPlaneY.mtrl
rename to Models/Widgets/Translate/TranslationWidgetPlaneY.mtrl
diff --git a/Models/WidgetPlaneZ.mesh b/Models/Widgets/Translate/TranslationWidgetPlaneZ.mesh
similarity index 100%
rename from Models/WidgetPlaneZ.mesh
rename to Models/Widgets/Translate/TranslationWidgetPlaneZ.mesh
diff --git a/Models/WidgetPlaneZ.mtrl b/Models/Widgets/Translate/TranslationWidgetPlaneZ.mtrl
similarity index 100%
rename from Models/WidgetPlaneZ.mtrl
rename to Models/Widgets/Translate/TranslationWidgetPlaneZ.mtrl
diff --git a/Models/TranslationWidgetX.mesh b/Models/Widgets/Translate/TranslationWidgetX.mesh
similarity index 100%
rename from Models/TranslationWidgetX.mesh
rename to Models/Widgets/Translate/TranslationWidgetX.mesh
diff --git a/Models/TranslationWidgetX.mtrl b/Models/Widgets/Translate/TranslationWidgetX.mtrl
similarity index 100%
rename from Models/TranslationWidgetX.mtrl
rename to Models/Widgets/Translate/TranslationWidgetX.mtrl
diff --git a/Models/TranslationWidgetY.mesh b/Models/Widgets/Translate/TranslationWidgetY.mesh
similarity index 100%
rename from Models/TranslationWidgetY.mesh
rename to Models/Widgets/Translate/TranslationWidgetY.mesh
diff --git a/Models/TranslationWidgetY.mtrl b/Models/Widgets/Translate/TranslationWidgetY.mtrl
similarity index 100%
rename from Models/TranslationWidgetY.mtrl
rename to Models/Widgets/Translate/TranslationWidgetY.mtrl
diff --git a/Models/TranslationWidgetZ.mesh b/Models/Widgets/Translate/TranslationWidgetZ.mesh
similarity index 100%
rename from Models/TranslationWidgetZ.mesh
rename to Models/Widgets/Translate/TranslationWidgetZ.mesh
diff --git a/Models/TranslationWidgetZ.mtrl b/Models/Widgets/Translate/TranslationWidgetZ.mtrl
similarity index 100%
rename from Models/TranslationWidgetZ.mtrl
rename to Models/Widgets/Translate/TranslationWidgetZ.mtrl
diff --git a/Models/coolCube.mesh b/Models/coolCube.mesh
deleted file mode 100644
index e54a9ff..0000000
Binary files a/Models/coolCube.mesh and /dev/null differ
diff --git a/Models/coolCube.mtrl b/Models/coolCube.mtrl
deleted file mode 100644
index 08dcd76..0000000
Binary files a/Models/coolCube.mtrl and /dev/null differ
diff --git a/Textures/CameraTexture.png b/Textures/CameraTexture.png
deleted file mode 100644
index 7683516..0000000
Binary files a/Textures/CameraTexture.png and /dev/null differ
diff --git a/Textures/Hourglasses/Hourglass7.png b/Textures/Hourglasses/Hourglass7.png
deleted file mode 100644
index 0608173..0000000
Binary files a/Textures/Hourglasses/Hourglass7.png and /dev/null differ
diff --git a/Textures/FoliageDiff.png b/Textures/Props/FoliageDiff.png
similarity index 100%
rename from Textures/FoliageDiff.png
rename to Textures/Props/FoliageDiff.png
diff --git a/Textures/FoliageSpec.png b/Textures/Props/FoliageSpec.png
similarity index 100%
rename from Textures/FoliageSpec.png
rename to Textures/Props/FoliageSpec.png
diff --git a/Textures/LogDiff.png b/Textures/Props/LogDiff.png
similarity index 100%
rename from Textures/LogDiff.png
rename to Textures/Props/LogDiff.png
diff --git a/Textures/LogNorm.png b/Textures/Props/LogNorm.png
similarity index 100%
rename from Textures/LogNorm.png
rename to Textures/Props/LogNorm.png
diff --git a/Textures/GlowTest.png b/Textures/Test/GlowTest.png
similarity index 100%
rename from Textures/GlowTest.png
rename to Textures/Test/GlowTest.png
diff --git a/Textures/GrassuDiff.png b/Textures/Test/GrassuDiff.png
similarity index 100%
rename from Textures/GrassuDiff.png
rename to Textures/Test/GrassuDiff.png
diff --git a/Textures/HexmapDiff.png b/Textures/Test/HexmapDiff.png
similarity index 100%
rename from Textures/HexmapDiff.png
rename to Textures/Test/HexmapDiff.png
diff --git a/Textures/HexmapNorm.png b/Textures/Test/HexmapNorm.png
similarity index 100%
rename from Textures/HexmapNorm.png
rename to Textures/Test/HexmapNorm.png
diff --git a/Textures/PefectStoneDiff.png b/Textures/Test/PefectStoneDiff.png
similarity index 100%
rename from Textures/PefectStoneDiff.png
rename to Textures/Test/PefectStoneDiff.png
diff --git a/Textures/PefectStoneNorm.png b/Textures/Test/PefectStoneNorm.png
similarity index 100%
rename from Textures/PefectStoneNorm.png
rename to Textures/Test/PefectStoneNorm.png
diff --git a/Textures/SmallDiff.png b/Textures/Test/SmallDiff.png
similarity index 100%
rename from Textures/SmallDiff.png
rename to Textures/Test/SmallDiff.png
diff --git a/Textures/SpecTest.png b/Textures/Test/SpecTest.png
similarity index 100%
rename from Textures/SpecTest.png
rename to Textures/Test/SpecTest.png
diff --git a/Textures/aM4ME4GR.png b/Textures/Test/aM4ME4GR.png
similarity index 100%
rename from Textures/aM4ME4GR.png
rename to Textures/Test/aM4ME4GR.png
diff --git a/Textures/hexagons.png b/Textures/Test/hexagons.png
similarity index 100%
rename from Textures/hexagons.png
rename to Textures/Test/hexagons.png
diff --git a/Textures/AssaultWeaponNormalMap.png b/Textures/Weapons/AssaultWeaponNormalMap.png
similarity index 100%
rename from Textures/AssaultWeaponNormalMap.png
rename to Textures/Weapons/AssaultWeaponNormalMap.png
diff --git a/Textures/AssaultWeaponSpecularMap.png b/Textures/Weapons/AssaultWeaponSpecularMap.png
similarity index 100%
rename from Textures/AssaultWeaponSpecularMap.png
rename to Textures/Weapons/AssaultWeaponSpecularMap.png
diff --git a/Textures/AssaultWeaponBlueGlowMap.png b/Textures/Weapons/Blue/AssaultWeaponBlueGlowMap.png
similarity index 100%
rename from Textures/AssaultWeaponBlueGlowMap.png
rename to Textures/Weapons/Blue/AssaultWeaponBlueGlowMap.png
diff --git a/Textures/AssaultWeaponBlueTexture.png b/Textures/Weapons/Blue/AssaultWeaponBlueTexture.png
similarity index 100%
rename from Textures/AssaultWeaponBlueTexture.png
rename to Textures/Weapons/Blue/AssaultWeaponBlueTexture.png
diff --git a/Textures/DefenderGunBlueDiff.png b/Textures/Weapons/Blue/DefenderGunBlueDiff.png
similarity index 100%
rename from Textures/DefenderGunBlueDiff.png
rename to Textures/Weapons/Blue/DefenderGunBlueDiff.png
diff --git a/Textures/DefenderGunBlueIncd.png b/Textures/Weapons/Blue/DefenderGunBlueIncd.png
similarity index 100%
rename from Textures/DefenderGunBlueIncd.png
rename to Textures/Weapons/Blue/DefenderGunBlueIncd.png
diff --git a/Textures/DefenderGunNorm.png b/Textures/Weapons/DefenderGunNorm.png
similarity index 100%
rename from Textures/DefenderGunNorm.png
rename to Textures/Weapons/DefenderGunNorm.png
diff --git a/Textures/DefenderGunSpec.png b/Textures/Weapons/DefenderGunSpec.png
similarity index 100%
rename from Textures/DefenderGunSpec.png
rename to Textures/Weapons/DefenderGunSpec.png
diff --git a/Textures/AssaultWeaponRedGlowMap.png b/Textures/Weapons/Red/AssaultWeaponRedGlowMap.png
similarity index 100%
rename from Textures/AssaultWeaponRedGlowMap.png
rename to Textures/Weapons/Red/AssaultWeaponRedGlowMap.png
diff --git a/Textures/AssaultWeaponRedTexture.png b/Textures/Weapons/Red/AssaultWeaponRedTexture.png
similarity index 100%
rename from Textures/AssaultWeaponRedTexture.png
rename to Textures/Weapons/Red/AssaultWeaponRedTexture.png
diff --git a/Textures/DefenderGunRedDiff.png b/Textures/Weapons/Red/DefenderGunRedDiff.png
similarity index 100%
rename from Textures/DefenderGunRedDiff.png
rename to Textures/Weapons/Red/DefenderGunRedDiff.png
diff --git a/Textures/DefenderGunRedIncd.png b/Textures/Weapons/Red/DefenderGunRedIncd.png
similarity index 100%
rename from Textures/DefenderGunRedIncd.png
rename to Textures/Weapons/Red/DefenderGunRedIncd.png
diff --git a/Textures/Hourglasses/Hourglass1.png b/Textures/Widgets/Loading/Hourglass1.png
similarity index 78%
rename from Textures/Hourglasses/Hourglass1.png
rename to Textures/Widgets/Loading/Hourglass1.png
index 04e79e6..df81605 100644
Binary files a/Textures/Hourglasses/Hourglass1.png and b/Textures/Widgets/Loading/Hourglass1.png differ
diff --git a/Textures/Hourglasses/Hourglass2.png b/Textures/Widgets/Loading/Hourglass2.png
similarity index 78%
rename from Textures/Hourglasses/Hourglass2.png
rename to Textures/Widgets/Loading/Hourglass2.png
index 63dce90..5299755 100644
Binary files a/Textures/Hourglasses/Hourglass2.png and b/Textures/Widgets/Loading/Hourglass2.png differ
diff --git a/Textures/Hourglasses/Hourglass3.png b/Textures/Widgets/Loading/Hourglass3.png
similarity index 78%
rename from Textures/Hourglasses/Hourglass3.png
rename to Textures/Widgets/Loading/Hourglass3.png
index 364f3af..8102e35 100644
Binary files a/Textures/Hourglasses/Hourglass3.png and b/Textures/Widgets/Loading/Hourglass3.png differ
diff --git a/Textures/Hourglasses/Hourglass4.png b/Textures/Widgets/Loading/Hourglass4.png
similarity index 78%
rename from Textures/Hourglasses/Hourglass4.png
rename to Textures/Widgets/Loading/Hourglass4.png
index 09a5ee8..e321da9 100644
Binary files a/Textures/Hourglasses/Hourglass4.png and b/Textures/Widgets/Loading/Hourglass4.png differ
diff --git a/Textures/Hourglasses/Hourglass5.png b/Textures/Widgets/Loading/Hourglass5.png
similarity index 78%
rename from Textures/Hourglasses/Hourglass5.png
rename to Textures/Widgets/Loading/Hourglass5.png
index 58c4098..469e340 100644
Binary files a/Textures/Hourglasses/Hourglass5.png and b/Textures/Widgets/Loading/Hourglass5.png differ
diff --git a/Textures/Hourglasses/Hourglass6.png b/Textures/Widgets/Loading/Hourglass6.png
similarity index 78%
rename from Textures/Hourglasses/Hourglass6.png
rename to Textures/Widgets/Loading/Hourglass6.png
index 34bd139..030539c 100644
Binary files a/Textures/Hourglasses/Hourglass6.png and b/Textures/Widgets/Loading/Hourglass6.png differ
diff --git a/Textures/body01.png b/Textures/body01.png
deleted file mode 100644
index 9c42592..0000000
Binary files a/Textures/body01.png and /dev/null differ
diff --git a/Textures/head01.png b/Textures/head01.png
deleted file mode 100644
index 6f98c4d..0000000
Binary files a/Textures/head01.png and /dev/null differ
diff --git a/Textures/m4tex.png b/Textures/m4tex.png
deleted file mode 100644
index d3c3a6d..0000000
Binary files a/Textures/m4tex.png and /dev/null differ