adds watcher functionality
adds src files tracking and improves the code