Moved observers to their own package