a little bit of cleanup and re-org

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