We are happy to make breaking compatible changes to internal interfaces, so we shouldn't be leaving behind shim files for any module directories with an underscore in the naming hierarchy when refactoring. During #1357, this was an issue.