broke out Step subclasses into their own package, adjusted visibility