jacket-5
Updated codegeneration layout