Struture Changes following feedback, moving back to layers. Added in InfoService to view