Changing the generated project structure.
Fixing the tests.