Fix Merge issue where a new file was added and had to moved into the
directory structure