Reorganize and update python for new format, etc.