Tidied class structure and removed unnecessary classes