reorganize grape entities
reorganize migrations