Revert "Rename classes"

This reverts commit 125c0b6ac785c32762f5f1b79ea711c78411182b.
Revert "Change travis to use php5-fpm instead of php-cgi"

This reverts commit 1c9b6703f00d37a00789eccfe4d4d49480c77eef.