folder rearrangement and script merge