Move type classes
Fix TString
Fix tests