Organization

enums, state and time clean up