Move classes into its own file