More restructuring; WIP

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