Proper abstraction of Module store base class implemented

@dmitchell @cpennington Just some small changes to make the inheritance structure clearer, and cleaning out a couple unused inputs.