some changes in gluecode for the new package structure