Refactored CommonQueries.packageDeclarations