Working on store, moved marco and polo into the store package.
Removed marco and polo from the package manifest
housekeeping to refactor marco and polo as parts of store package rather than their own entities.
Latest store fixes.