Restructured for Component Store, fixed up sample, etc.