Reorganize source tree in a coherent fashion