Reorganize

Signed-off-by: Stephen Celis <stephen@stephencelis.com>