fix package paths ...