Additional module classes

Added in places to store module information, but no setters or getters
yet.