Moved statemachine to new folder