Combined some classes into one file.