removed submodule architecture -- too unweildy to maintain