Change of plan - add as Samples/CommonSrc