refactor module dir