Adapted dev-branch to submodules