Reorganize source files a bit.