Removed cached submodule leftovers
Added files from old submodules directly