Project structure modified in simulator, engine and tests.