Move some classes into their own files