updated submodules and directory structure