Make versions consistently have both files
Move versions into matching subdirectories to make script simpler
Add helper script to switch between code versions