Wrap long case classes per idea from Randy
Undo most changes to Service and Main, due to robertm's upcoming refactoring

Will go back and clean it up after refactoring, hopefully