move and rename entity specs and change the deps of other specs so they require in the newly named files
update the example deps
change the includes to use the new names of entity files