A major rewrite and simplification of storm_components package. Code duplication removed.