Breaking out classes into own file