Move NonRecyclingPCR into correct package, make it an injectable
service, update test.