More cleanup. Moving things into subdirs and making it much easier to read.