Move classes into files