Moving things to the right place, updating entities to reflect separation of DB schemas.