Reorganize files, cleanup

Signed-off-by: Eric Amundson <eric@ivycat.com>