Added ServiceIdentity, restructured and rearranged.
DI updates
Fixed Store and Phone projects