move to Kohana 3.3 structure and conventions