PSR-0 and few other changes (no HTML output...)