changed generated package structure