major refactoring of speech related classes