Fix package paths