Migrate shell files to a new format
Minor modifications