Refactoring

- removed unnecessary classes