Reorder and add phpunit to require-dev
Strictly obey PSR-0 naming convention