Reorganization of the source tree