Make PSR-0 and fix bugs.