completely reorganized the thing

Signed-off-by: Chris Jones <chris@jonezy.org>
big reorg, pretty finalized in this respect ow!

Signed-off-by: Chris Jones <chris@jonezy.org>