HG-195 rename folders/files to match new structure