Removed data classes.
Made some refactoring.