Completed Py2/Py3 reorganization