Revert "update submodules"

This reverts commit fb3577170667444d6f6898fe75727a5f53c2798c.
move submodules properly
rename everything