redoing gitmodules - part 1 cleanup
added submodules back in