Changed up the directory structure.