Changed around the directory structure