Cleanup of PM

PM module (but not code!) was left by mistake
present in the build. Also, newly added files
were missed to be moved