change structure, scripts and controls scripts in same place