Moved stuff around, renamed things properly

Signed-off-by: Joseph Lee <joseph@idealist.org>