Fixed directory structure in prep for project.