+ refactored the packages for the new company name