[sr-dev] git:master: pdt(k): restructured sources