Change folder structure for ChoiceList and ChoiceItem functionality
Change Object notion to EntityClass notion