Better Organization of Scripts