directory struct alignment with latest codecengine