Changed up the directory structure a bit to make files easier to reference.