Moved modules to components for watchers and assigned