[src] reorganized; adding recognition