Refactored the org.composer.packages package