some changes in directory structure