removed submodule architecture - unmaintainable