PsiClasses based on derived JvmTypes instead of serializing/parsing
Changed a few confusing class names