refactor code. Add the modules folder