diff --git a/Connect.py b/constraints/Connect.py
similarity index 100%
rename from Connect.py
rename to constraints/Connect.py
diff --git a/Constraint.py b/constraints/Constraint.py
similarity index 100%
rename from Constraint.py
rename to constraints/Constraint.py
diff --git a/Equal.py b/constraints/Equal.py
similarity index 100%
rename from Equal.py
rename to constraints/Equal.py
diff --git a/Horizontal.py b/constraints/Horizontal.py
similarity index 100%
rename from Horizontal.py
rename to constraints/Horizontal.py
diff --git a/Vertical.py b/constraints/Vertical.py
similarity index 100%
rename from Vertical.py
rename to constraints/Vertical.py
diff --git a/XDistance.py b/constraints/XDistance.py
similarity index 100%
rename from XDistance.py
rename to constraints/XDistance.py
diff --git a/XFix.py b/constraints/XFix.py
similarity index 100%
rename from XFix.py
rename to constraints/XFix.py
diff --git a/YDistance.py b/constraints/YDistance.py
similarity index 100%
rename from YDistance.py
rename to constraints/YDistance.py
diff --git a/YFix.py b/constraints/YFix.py
similarity index 100%
rename from YFix.py
rename to constraints/YFix.py
diff --git a/constraints.py b/constraints/__init__.py
similarity index 100%
rename from constraints.py
rename to constraints/__init__.py
diff --git a/Circle.py b/shapes/Circle.py
similarity index 100%
rename from Circle.py
rename to shapes/Circle.py
diff --git a/Line.py b/shapes/Line.py
similarity index 100%
rename from Line.py
rename to shapes/Line.py
diff --git a/Shape.py b/shapes/Shape.py
similarity index 100%
rename from Shape.py
rename to shapes/Shape.py
diff --git a/shapes.py b/shapes/__init__.py
similarity index 100%
rename from shapes.py
rename to shapes/__init__.py