Reorganize source tree a bit.