TH-12 | Refactor codes and file name