Restructure

Signed-off-by: Sam Heuck <sam@samheuck.com>
Uptades to graphite tasks

Signed-off-by: Sam Heuck <sam@samheuck.com>