Changed module / scoping stuff up a bit.
Merge pull request #2 from shans/fixIt

Changed module / scoping stuff up a bit.