-Temporary Testclasses and enums removed
-Classfiles are in Folders now
-StateListener added in term of refactoring cause of double implementation