fix package definitions, seems to work now