Fix package structure for duplicate detection