Cleaned up the structure (still TODO)...
Fixed watchertasks