Split to directories.
Resolve conflict.
Chkpt
Fix some virtualenv wrapper stuff.  Sigh.