Move two submodules into lib