Original commit message from CVS: More refactoring osssrc has more features now, like query/convert etc