Rename Struct to StructType and create framework for ClassType