Changed module / scoping stuff up a bit.