Moves Span to separate module