Switched submodules to fbaumgardt/*