add more submodules; fix requirements, paths