Refactored world, removed 2D and 3D notation

New project files