replaced paths with files
moved watchers into separate package
excluded logging from lib