diff --git a/.gitmodules b/.gitmodules
index 5fe19da..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,12 +0,0 @@
-[submodule "slvs"]
-	path = slvs
-	url = https://github.com/realthunder/solvespace.git
-[submodule "py_slvs"]
-	path = py_slvs
-	url = https://github.com/realthunder/py_slvs.git
-[submodule "py_slvs_mac"]
-	path = py_slvs_mac
-	url = https://github.com/realthunder/py_slvs_mac.git
-[submodule "py3_slvs"]
-	path = py3_slvs
-	url = https://github.com/realthunder/py3_slvs.git
diff --git a/freecad/__init__.py b/freecad/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/FCADLogger.py b/freecad/asm3/FCADLogger.py
similarity index 100%
rename from FCADLogger.py
rename to freecad/asm3/FCADLogger.py
diff --git a/Gui/Resources/icons/AssemblyWorkbench.svg b/freecad/asm3/Gui/Resources/icons/AssemblyWorkbench.svg
similarity index 100%
rename from Gui/Resources/icons/AssemblyWorkbench.svg
rename to freecad/asm3/Gui/Resources/icons/AssemblyWorkbench.svg
diff --git a/Gui/Resources/icons/Assembly_Add_New_Part.svg b/freecad/asm3/Gui/Resources/icons/Assembly_Add_New_Part.svg
similarity index 100%
rename from Gui/Resources/icons/Assembly_Add_New_Part.svg
rename to freecad/asm3/Gui/Resources/icons/Assembly_Add_New_Part.svg
diff --git a/Gui/Resources/icons/Assembly_Add_Origin.svg b/freecad/asm3/Gui/Resources/icons/Assembly_Add_Origin.svg
similarity index 100%
rename from Gui/Resources/icons/Assembly_Add_Origin.svg
rename to freecad/asm3/Gui/Resources/icons/Assembly_Add_Origin.svg
diff --git a/Gui/Resources/icons/Assembly_Add_Placement.svg b/freecad/asm3/Gui/Resources/icons/Assembly_Add_Placement.svg
similarity index 100%
rename from Gui/Resources/icons/Assembly_Add_Placement.svg
rename to freecad/asm3/Gui/Resources/icons/Assembly_Add_Placement.svg
diff --git a/Gui/Resources/icons/Assembly_Add_Workplane.svg b/freecad/asm3/Gui/Resources/icons/Assembly_Add_Workplane.svg
similarity index 100%
rename from Gui/Resources/icons/Assembly_Add_Workplane.svg
rename to freecad/asm3/Gui/Resources/icons/Assembly_Add_Workplane.svg
diff --git a/Gui/Resources/icons/Assembly_Add_WorkplaneXZ.svg b/freecad/asm3/Gui/Resources/icons/Assembly_Add_WorkplaneXZ.svg
similarity index 100%
rename from Gui/Resources/icons/Assembly_Add_WorkplaneXZ.svg
rename to freecad/asm3/Gui/Resources/icons/Assembly_Add_WorkplaneXZ.svg
diff --git a/Gui/Resources/icons/Assembly_Add_WorkplaneZY.svg b/freecad/asm3/Gui/Resources/icons/Assembly_Add_WorkplaneZY.svg
similarity index 100%
rename from Gui/Resources/icons/Assembly_Add_WorkplaneZY.svg
rename to freecad/asm3/Gui/Resources/icons/Assembly_Add_WorkplaneZY.svg
diff --git a/Gui/Resources/icons/Assembly_Assembly_Constraints_Tree.svg b/freecad/asm3/Gui/Resources/icons/Assembly_Assembly_Constraints_Tree.svg
similarity index 100%
rename from Gui/Resources/icons/Assembly_Assembly_Constraints_Tree.svg
rename to freecad/asm3/Gui/Resources/icons/Assembly_Assembly_Constraints_Tree.svg
diff --git a/Gui/Resources/icons/Assembly_Assembly_Create_New.svg b/freecad/asm3/Gui/Resources/icons/Assembly_Assembly_Create_New.svg
similarity index 100%
rename from Gui/Resources/icons/Assembly_Assembly_Create_New.svg
rename to freecad/asm3/Gui/Resources/icons/Assembly_Assembly_Create_New.svg
diff --git a/Gui/Resources/icons/Assembly_Assembly_Element.svg b/freecad/asm3/Gui/Resources/icons/Assembly_Assembly_Element.svg
similarity index 100%
rename from Gui/Resources/icons/Assembly_Assembly_Element.svg
rename to freecad/asm3/Gui/Resources/icons/Assembly_Assembly_Element.svg
diff --git a/Gui/Resources/icons/Assembly_Assembly_ElementDetached.svg b/freecad/asm3/Gui/Resources/icons/Assembly_Assembly_ElementDetached.svg
similarity index 100%
rename from Gui/Resources/icons/Assembly_Assembly_ElementDetached.svg
rename to freecad/asm3/Gui/Resources/icons/Assembly_Assembly_ElementDetached.svg
diff --git a/Gui/Resources/icons/Assembly_Assembly_Element_Tree.svg b/freecad/asm3/Gui/Resources/icons/Assembly_Assembly_Element_Tree.svg
similarity index 100%
rename from Gui/Resources/icons/Assembly_Assembly_Element_Tree.svg
rename to freecad/asm3/Gui/Resources/icons/Assembly_Assembly_Element_Tree.svg
diff --git a/Gui/Resources/icons/Assembly_Assembly_Frozen_Tree.svg b/freecad/asm3/Gui/Resources/icons/Assembly_Assembly_Frozen_Tree.svg
similarity index 100%
rename from Gui/Resources/icons/Assembly_Assembly_Frozen_Tree.svg
rename to freecad/asm3/Gui/Resources/icons/Assembly_Assembly_Frozen_Tree.svg
diff --git a/Gui/Resources/icons/Assembly_Assembly_Part_Tree.svg b/freecad/asm3/Gui/Resources/icons/Assembly_Assembly_Part_Tree.svg
similarity index 100%
rename from Gui/Resources/icons/Assembly_Assembly_Part_Tree.svg
rename to freecad/asm3/Gui/Resources/icons/Assembly_Assembly_Part_Tree.svg
diff --git a/Gui/Resources/icons/Assembly_Assembly_Relation_Tree.svg b/freecad/asm3/Gui/Resources/icons/Assembly_Assembly_Relation_Tree.svg
similarity index 100%
rename from Gui/Resources/icons/Assembly_Assembly_Relation_Tree.svg
rename to freecad/asm3/Gui/Resources/icons/Assembly_Assembly_Relation_Tree.svg
diff --git a/Gui/Resources/icons/Assembly_Assembly_Tree.svg b/freecad/asm3/Gui/Resources/icons/Assembly_Assembly_Tree.svg
similarity index 100%
rename from Gui/Resources/icons/Assembly_Assembly_Tree.svg
rename to freecad/asm3/Gui/Resources/icons/Assembly_Assembly_Tree.svg
diff --git a/Gui/Resources/icons/Assembly_AutoElementVis.svg b/freecad/asm3/Gui/Resources/icons/Assembly_AutoElementVis.svg
similarity index 100%
rename from Gui/Resources/icons/Assembly_AutoElementVis.svg
rename to freecad/asm3/Gui/Resources/icons/Assembly_AutoElementVis.svg
diff --git a/Gui/Resources/icons/Assembly_AutoRecompute.svg b/freecad/asm3/Gui/Resources/icons/Assembly_AutoRecompute.svg
similarity index 100%
rename from Gui/Resources/icons/Assembly_AutoRecompute.svg
rename to freecad/asm3/Gui/Resources/icons/Assembly_AutoRecompute.svg
diff --git a/Gui/Resources/icons/Assembly_AxialMove.svg b/freecad/asm3/Gui/Resources/icons/Assembly_AxialMove.svg
similarity index 100%
rename from Gui/Resources/icons/Assembly_AxialMove.svg
rename to freecad/asm3/Gui/Resources/icons/Assembly_AxialMove.svg
diff --git a/Gui/Resources/icons/Assembly_ConstraintMultiply.svg b/freecad/asm3/Gui/Resources/icons/Assembly_ConstraintMultiply.svg
similarity index 100%
rename from Gui/Resources/icons/Assembly_ConstraintMultiply.svg
rename to freecad/asm3/Gui/Resources/icons/Assembly_ConstraintMultiply.svg
diff --git a/Gui/Resources/icons/Assembly_Disabled.svg b/freecad/asm3/Gui/Resources/icons/Assembly_Disabled.svg
similarity index 100%
rename from Gui/Resources/icons/Assembly_Disabled.svg
rename to freecad/asm3/Gui/Resources/icons/Assembly_Disabled.svg
diff --git a/Gui/Resources/icons/Assembly_GotoRelation.svg b/freecad/asm3/Gui/Resources/icons/Assembly_GotoRelation.svg
similarity index 100%
rename from Gui/Resources/icons/Assembly_GotoRelation.svg
rename to freecad/asm3/Gui/Resources/icons/Assembly_GotoRelation.svg
diff --git a/Gui/Resources/icons/Assembly_Import.svg b/freecad/asm3/Gui/Resources/icons/Assembly_Import.svg
similarity index 100%
rename from Gui/Resources/icons/Assembly_Import.svg
rename to freecad/asm3/Gui/Resources/icons/Assembly_Import.svg
diff --git a/Gui/Resources/icons/Assembly_ImportMulti.svg b/freecad/asm3/Gui/Resources/icons/Assembly_ImportMulti.svg
similarity index 100%
rename from Gui/Resources/icons/Assembly_ImportMulti.svg
rename to freecad/asm3/Gui/Resources/icons/Assembly_ImportMulti.svg
diff --git a/Gui/Resources/icons/Assembly_LockMover.svg b/freecad/asm3/Gui/Resources/icons/Assembly_LockMover.svg
similarity index 100%
rename from Gui/Resources/icons/Assembly_LockMover.svg
rename to freecad/asm3/Gui/Resources/icons/Assembly_LockMover.svg
diff --git a/Gui/Resources/icons/Assembly_Move.svg b/freecad/asm3/Gui/Resources/icons/Assembly_Move.svg
similarity index 100%
rename from Gui/Resources/icons/Assembly_Move.svg
rename to freecad/asm3/Gui/Resources/icons/Assembly_Move.svg
diff --git a/Gui/Resources/icons/Assembly_New_Assembly.svg b/freecad/asm3/Gui/Resources/icons/Assembly_New_Assembly.svg
similarity index 100%
rename from Gui/Resources/icons/Assembly_New_Assembly.svg
rename to freecad/asm3/Gui/Resources/icons/Assembly_New_Assembly.svg
diff --git a/Gui/Resources/icons/Assembly_New_Element.svg b/freecad/asm3/Gui/Resources/icons/Assembly_New_Element.svg
similarity index 100%
rename from Gui/Resources/icons/Assembly_New_Element.svg
rename to freecad/asm3/Gui/Resources/icons/Assembly_New_Element.svg
diff --git a/Gui/Resources/icons/Assembly_New_Group.svg b/freecad/asm3/Gui/Resources/icons/Assembly_New_Group.svg
similarity index 100%
rename from Gui/Resources/icons/Assembly_New_Group.svg
rename to freecad/asm3/Gui/Resources/icons/Assembly_New_Group.svg
diff --git a/Gui/Resources/icons/Assembly_QuickMove.svg b/freecad/asm3/Gui/Resources/icons/Assembly_QuickMove.svg
similarity index 100%
rename from Gui/Resources/icons/Assembly_QuickMove.svg
rename to freecad/asm3/Gui/Resources/icons/Assembly_QuickMove.svg
diff --git a/Gui/Resources/icons/Assembly_QuickSolve.svg b/freecad/asm3/Gui/Resources/icons/Assembly_QuickSolve.svg
similarity index 100%
rename from Gui/Resources/icons/Assembly_QuickSolve.svg
rename to freecad/asm3/Gui/Resources/icons/Assembly_QuickSolve.svg
diff --git a/Gui/Resources/icons/Assembly_ShowElementCS.svg b/freecad/asm3/Gui/Resources/icons/Assembly_ShowElementCS.svg
similarity index 100%
rename from Gui/Resources/icons/Assembly_ShowElementCS.svg
rename to freecad/asm3/Gui/Resources/icons/Assembly_ShowElementCS.svg
diff --git a/Gui/Resources/icons/Assembly_SmartRecompute.svg b/freecad/asm3/Gui/Resources/icons/Assembly_SmartRecompute.svg
similarity index 100%
rename from Gui/Resources/icons/Assembly_SmartRecompute.svg
rename to freecad/asm3/Gui/Resources/icons/Assembly_SmartRecompute.svg
diff --git a/Gui/Resources/icons/Assembly_TogglePartVisibility.svg b/freecad/asm3/Gui/Resources/icons/Assembly_TogglePartVisibility.svg
similarity index 100%
rename from Gui/Resources/icons/Assembly_TogglePartVisibility.svg
rename to freecad/asm3/Gui/Resources/icons/Assembly_TogglePartVisibility.svg
diff --git a/Gui/Resources/icons/Assembly_Trace.svg b/freecad/asm3/Gui/Resources/icons/Assembly_Trace.svg
similarity index 100%
rename from Gui/Resources/icons/Assembly_Trace.svg
rename to freecad/asm3/Gui/Resources/icons/Assembly_Trace.svg
diff --git a/Gui/Resources/icons/Assembly_TreeItemDown.svg b/freecad/asm3/Gui/Resources/icons/Assembly_TreeItemDown.svg
similarity index 100%
rename from Gui/Resources/icons/Assembly_TreeItemDown.svg
rename to freecad/asm3/Gui/Resources/icons/Assembly_TreeItemDown.svg
diff --git a/Gui/Resources/icons/Assembly_TreeItemUp.svg b/freecad/asm3/Gui/Resources/icons/Assembly_TreeItemUp.svg
similarity index 100%
rename from Gui/Resources/icons/Assembly_TreeItemUp.svg
rename to freecad/asm3/Gui/Resources/icons/Assembly_TreeItemUp.svg
diff --git a/Gui/Resources/icons/Assembly_Workplane.svg b/freecad/asm3/Gui/Resources/icons/Assembly_Workplane.svg
similarity index 100%
rename from Gui/Resources/icons/Assembly_Workplane.svg
rename to freecad/asm3/Gui/Resources/icons/Assembly_Workplane.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintAlignment.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintAlignment.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintAlignment.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintAlignment.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintAngle.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintAngle.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintAngle.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintAngle.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintArcLineTangent.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintArcLineTangent.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintArcLineTangent.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintArcLineTangent.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintAttachment.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintAttachment.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintAttachment.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintAttachment.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintAxial.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintAxial.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintAxial.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintAxial.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintBidirectional.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintBidirectional.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintBidirectional.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintBidirectional.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintCoincidence.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintCoincidence.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintCoincidence.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintCoincidence.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintColinear.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintColinear.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintColinear.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintColinear.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintDiameter.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintDiameter.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintDiameter.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintDiameter.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintDistance.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintDistance.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintDistance.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintDistance.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintEqual.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintEqual.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintEqual.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintEqual.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintEqualAngle.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintEqualAngle.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintEqualAngle.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintEqualAngle.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintEqualLength.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintEqualLength.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintEqualLength.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintEqualLength.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintEqualLineArcLength.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintEqualLineArcLength.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintEqualLineArcLength.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintEqualLineArcLength.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintEqualPointLineDistance.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintEqualPointLineDistance.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintEqualPointLineDistance.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintEqualPointLineDistance.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintEqualRadius.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintEqualRadius.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintEqualRadius.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintEqualRadius.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintGeneral.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintGeneral.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintGeneral.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintGeneral.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintLengthDifference.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintLengthDifference.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintLengthDifference.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintLengthDifference.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintLengthEqualPointLineDistance.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintLengthEqualPointLineDistance.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintLengthEqualPointLineDistance.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintLengthEqualPointLineDistance.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintLengthRatio.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintLengthRatio.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintLengthRatio.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintLengthRatio.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintLineHorizontal.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintLineHorizontal.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintLineHorizontal.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintLineHorizontal.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintLineLength.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintLineLength.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintLineLength.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintLineLength.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintLineVertical.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintLineVertical.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintLineVertical.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintLineVertical.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintLock.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintLock.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintLock.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintLock.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintMidPoint.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintMidPoint.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintMidPoint.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintMidPoint.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintMore.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintMore.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintMore.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintMore.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintMultiParallel.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintMultiParallel.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintMultiParallel.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintMultiParallel.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintOrientation.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintOrientation.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintOrientation.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintOrientation.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintParallel.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintParallel.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintParallel.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintParallel.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintPerpendicular.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintPerpendicular.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintPerpendicular.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintPerpendicular.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintPointCoincident.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintPointCoincident.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintPointCoincident.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintPointCoincident.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintPointDistance.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintPointDistance.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintPointDistance.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintPointDistance.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintPointInPlane.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintPointInPlane.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintPointInPlane.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintPointInPlane.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintPointLineDistance.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintPointLineDistance.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintPointLineDistance.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintPointLineDistance.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintPointOnCircle.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintPointOnCircle.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintPointOnCircle.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintPointOnCircle.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintPointOnLine.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintPointOnLine.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintPointOnLine.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintPointOnLine.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintPointPlaneDistance.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintPointPlaneDistance.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintPointPlaneDistance.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintPointPlaneDistance.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintPointsDistance.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintPointsDistance.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintPointsDistance.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintPointsDistance.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintPointsHorizontal.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintPointsHorizontal.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintPointsHorizontal.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintPointsHorizontal.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintPointsProjectDistance.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintPointsProjectDistance.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintPointsProjectDistance.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintPointsProjectDistance.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintPointsSymmetric.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintPointsSymmetric.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintPointsSymmetric.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintPointsSymmetric.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintPointsVertical.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintPointsVertical.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintPointsVertical.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintPointsVertical.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintSketchPlane.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintSketchPlane.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintSketchPlane.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintSketchPlane.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintSymmetric.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintSymmetric.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintSymmetric.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintSymmetric.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintSymmetricLine.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintSymmetricLine.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintSymmetricLine.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintSymmetricLine.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintUnidirectional1.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintUnidirectional1.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintUnidirectional1.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintUnidirectional1.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_ConstraintUnidirectional2.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintUnidirectional2.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_ConstraintUnidirectional2.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_ConstraintUnidirectional2.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_MeasureAngle.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_MeasureAngle.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_MeasureAngle.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_MeasureAngle.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_MeasurePointDistance.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_MeasurePointDistance.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_MeasurePointDistance.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_MeasurePointDistance.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_MeasurePointLineDistance.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_MeasurePointLineDistance.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_MeasurePointLineDistance.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_MeasurePointLineDistance.svg
diff --git a/Gui/Resources/icons/constraints/Assembly_MeasurePointPlaneDistance.svg b/freecad/asm3/Gui/Resources/icons/constraints/Assembly_MeasurePointPlaneDistance.svg
similarity index 100%
rename from Gui/Resources/icons/constraints/Assembly_MeasurePointPlaneDistance.svg
rename to freecad/asm3/Gui/Resources/icons/constraints/Assembly_MeasurePointPlaneDistance.svg
diff --git a/freecad/asm3/__init__.py b/freecad/asm3/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/assembly.py b/freecad/asm3/assembly.py
similarity index 100%
rename from assembly.py
rename to freecad/asm3/assembly.py
diff --git a/constraint.py b/freecad/asm3/constraint.py
similarity index 100%
rename from constraint.py
rename to freecad/asm3/constraint.py
diff --git a/deps/__init__.py b/freecad/asm3/deps/__init__.py
similarity index 100%
rename from deps/__init__.py
rename to freecad/asm3/deps/__init__.py
diff --git a/deps/six.py b/freecad/asm3/deps/six.py
similarity index 100%
rename from deps/six.py
rename to freecad/asm3/deps/six.py
diff --git a/gui.py b/freecad/asm3/gui.py
similarity index 100%
rename from gui.py
rename to freecad/asm3/gui.py
diff --git a/init_gui.py b/freecad/asm3/init_gui.py
similarity index 100%
rename from init_gui.py
rename to freecad/asm3/init_gui.py
diff --git a/mover.py b/freecad/asm3/mover.py
similarity index 100%
rename from mover.py
rename to freecad/asm3/mover.py
diff --git a/proxy.py b/freecad/asm3/proxy.py
similarity index 100%
rename from proxy.py
rename to freecad/asm3/proxy.py
diff --git a/solver.py b/freecad/asm3/solver.py
similarity index 100%
rename from solver.py
rename to freecad/asm3/solver.py
diff --git a/sys_slvs.py b/freecad/asm3/sys_slvs.py
similarity index 100%
rename from sys_slvs.py
rename to freecad/asm3/sys_slvs.py
diff --git a/sys_sympy.py b/freecad/asm3/sys_sympy.py
similarity index 100%
rename from sys_sympy.py
rename to freecad/asm3/sys_sympy.py
diff --git a/system.py b/freecad/asm3/system.py
similarity index 100%
rename from system.py
rename to freecad/asm3/system.py
diff --git a/utils.py b/freecad/asm3/utils.py
similarity index 100%
rename from utils.py
rename to freecad/asm3/utils.py
diff --git a/py3_slvs b/py3_slvs
deleted file mode 160000
index c88d11f..0000000
--- a/py3_slvs
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c88d11fb9c7294e4d247725ac83904704a2c4613
diff --git a/py_slvs b/py_slvs
deleted file mode 160000
index 13a83d4..0000000
--- a/py_slvs
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 13a83d416ff73c29f63a65d5b14081e8a11b04a6
diff --git a/py_slvs_mac b/py_slvs_mac
deleted file mode 160000
index b0f9c6a..0000000
--- a/py_slvs_mac
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b0f9c6a28d4e5d37e7196c9dfe3b6bb92645214f
diff --git a/slvs b/slvs
deleted file mode 160000
index 963a733..0000000
--- a/slvs
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 963a7331f705518b70d4e62bcecd9ca7f993094a