More Re-Org and Robust Handlers

. More organizations
. Dealt with race conditions of handlers