Moved each class in it's own file