New project structure
Removed submodule