Now code generation uses the correct package structure