Work on refactor and reorganice some elements