Code generation updated according to new package hierarchy.