moved more classes into their respective files.