Unstable. Shuffling files around in anticipation of making things more Pythonic.

Reorganizing files.