Add shared packages
Use shared packages for everything possible
Adding marketplace back temporarily