Removing modules

And we haven't even started the real code yet!