Better Class format

Separate app, classes, and test apart