moved entities to a more suited package