CSPACE-6278: Added test build of the Services layer, reorganized 'require' layout.