code refactor, file renaming