Revert "CON-420: Moved spotlights to extension"

This reverts commit b0e17d120ea0ac5c321bd2ac250c0dad6a8db929.