Renamed files to fit kohana 3.3