Add packages to requirements, replace submodules