Reorganise source directory