Factored Storm install into a class.
Factored out Storm component into type.