Move State to Event
Improve file organization
Cleanup routes