Made branches smaller as they get further out, entities in their own package