Updates
Move into subdir
Sort out submodules