Refactoring
Reorganized Constants and removed duplicate import in Settings.h