Removed i18n
Moved and renamed class, use chaining methods now
Starting refacto and enhancement