Moving classes to each have their own file.