restructuring and cleaning up

Signed-off-by: Matt Keys <matt@uptrending.com>