A few files that are straight imports, like the memory_profiler.  But a lot of small script changes below as well, so please view!