Major modifications - adding more base classes and finer control over module contents' object types.