feat.: refactoring each module