Cleanup
proper submodules
Add setup script