Began restructuring in Python 3, new entries complete