Pull out classes into there own file