refactor for clarity; don't ignore XxxPackage files not related to Kotlin