Fixed file watchers and cleaned up usings