Refactor some files
refactor some files