Refactored the packages to conform with the standard.