PSR-0 compliance on rjmackay/develop branch