Python reorg