structure change, removing submodule