Broke submodules
Much refactoring