reorganized jmap