Adjusting the directory structure