A little more structure, monitor app, tests folder