remove stale code
create submodule equivalents