Refactored to use standardised PSR-0 namespaces.