Watch files for changes properly