Added recognizer, changed package structure