Refactor - rename module folders