Moved several classes into separate files