CON-1359: Moved modules to extensions