Integrated Entities into CBB
New Entities Folder