Fix for unicode.py
Split up some modules