change some files location, fix some errors