-code cleanup, refactoring, and files moved from a watched-dir to a non-watched dir are now properly handled