Reorganise source analysis file structure