Outsourced some constants in a global class; Added package-info-files; Modified some code for quality reasons