reorganization of python files almost complete