Added module name to all specs.
Moved the specs modules around a little.