Added translation feature and reorganized hierarchy