modify directory structure and remove some activity