Change to use relative package paths