Merge branch 'mypy-fix-small-folders' of https://github.com/algobytewise/Python into mypy-fix-small-folders