Move Entity specific classes into EntityStore NS

This makes it consistent with the rest of the component

Change-Id: Ia52c892d9fdb0a5e49052d1eb63be8464d5af5e6