Reorganize source tree