Making minor changes to directory structure