Create entity module with existing code
Move Entity store code to entity.store
New class structure