First refactor commit (with files..)