Some cleanup/reorganization
Signed-off-by: Chris Sanders <zidane@outlook.com>