minor cleanup
Move classes into their own files