implemented states system
deleted empty class files
Merge branch 'states'