Moved most modules to UMD