Moved files around a bit more.

Benjamin Mako Hill || Want to submit a patch?