Reorganizing for PSR-0 compatibility