Housekeeping: Use PSR2 as coding standard.
Namespace refactoring.