Adding constants and enums, restructuring
Finish with enums