Fixed module stuff.

Dlang doesn't like modules separated across files.