rename files + refactor and simplify the code