Reorganizing .do files