removed Tokenizing class, updated classes a little