Moving classes into their own file