Removed unnecessary usings
Moved enumerations and usings
Updated structure