Moved classes that should be in xShared