Moving classes into PSR-0 compliant structures