improve handling of HTML completion in PHP files
make handling of RPM packing stuff more modular