Various small changes
Addd submodules and moved things around