move .gitmodules back to top level and change paths