Renaming files for K2 refactor