move watch handler to lib. verify that files received are in our base.