Reorganize boilerplate entities.
Make initial adjustments.