Moved each class to own file