Re-arranging source tree