moved state classes to state folder