Refactor application on different modules