more restructuring
more restructuring; wip

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