reorganize grape entities