Refactored submodules to librarian-puppet