major structure updates

Signed-off-by: Jason Tempestini <jason@curlymedia.com>