refactor directory structure
update submodule paths