Refactored building tasks and fixed watchers