Reorganize source code hierarchy.