Removed some redundant imports and changed others from H98 to hierarchical modules.