Renamed p5m files
Introduce apr/apr-doc packages, move contents to /usr/apr