removed module indirection

This refactoring brought to you by our kick-ass test suite. :)