Moves each class to own file