Make the output of the generator flat - no /app folder.
Fixing the tests.