Moved files to be in line with the renaming