Refactory and new module #tubaina