Correcting project structure and tests.