Minor changes in directory structure