fixed watch and changed file structure