Restructuring and new scripts