[PAXURL-288] reordered package import patterns to avoid duplication