refactoring some files
refactoring some files