rename data class  location to place, update package strategy