refactors files
fixes FolderWatcher bug