slight updates in the structure and removed unnecessary classes