Refactoring Constants and Variables out into package specific files.