[*] Refactor project main classes