restructuring the branches and submodules