Now have a modules directory that instantiates and returns a list of Module subclass instances.
Merge branch 'modules'