Combined some class files and renamed to fit naming scheme