Moved classes into their own files