Address ISLANDORA-977.

These should be split out into the individual modules.