Reorganise files structure to make it more consistent.