fix package paths again