Make PSR-0 compliant

Change-Id: Iddb1b72427fe81a25c12378d0b83ba61316c3362