Cleanup

I moved submodules and other sources into subdirectories