Started refactoring packages and constants.