Normalising (I hope) the modules and namespacing.