Fixed package paths