Move submodules into lib/