removed submodule architecture -- too complex to maintain