Formatting to Kohana standard syntax
Fixing class names for Kohana 3.3