Reduce usage of orchestra/support and use singleton.

Signed-off-by: crynobone <crynobone@gmail.com>