rename folder, fix build errors