Simplified state machine
Simplified folder structure and remove entity bloat