Scripts folders reorganization