Re: [sr-dev] Restructuring source code tree for v5.0