Corrected package paths