Re-organized scripts