Change files, remanes another ones. Refactor in general