Splitting sessions and entities in different packages