Reorganize boilerplate entities.