3.3/master

Renaming files for PSR-0 support (Kohana 3.3)
Refactoring