Move into PSR-0 structure