Move some stuff around and make it PSR-0 compliant.