Structural changes

Changed structure to a compass project