Moved state classes to seperate package