Repackage optional modules for SmartClient