added further submodules
clean up