Refactoring. Added Gson. The watcher is working.