updates to organization and wrapper, may be broken

Signed-off-by: Sean Wesenberg <wookets@gmail.com>