refactor with thx folder