rearrange code to avoid repetition
Delete one import script, roll contents into the other