re-organize to match file structure required by script