moved state classes to folder UvA/states