more restructing; WIP

Signed-off-by: Joe Kulig <joseph.kulig@gmail.com>
more restructuring.

Signed-off-by: Joe Kulig <kulandthegang@gmail.com>