Moved classifier implementation to echo package.
Minor code fixes.