Refs #58 - Temporarily rename some modules until #44 is fixed