some changes to directory structure