Renaming for Kohana.
Simplified the module upon many considerations.