Sorted some entities into a separate package.