-Remove debug from package_file_search
-Simplify package type distinguishment