Refactor all files !