X-Git-Url: http://nitlanguage.org

diff --git a/tests/sav/neo_doxygen_file_compound.res b/tests/sav/neo_doxygen_file_compound.res
index ab885c0..16e541c 100644
--- a/tests/sav/neo_doxygen_file_compound.res
+++ b/tests/sav/neo_doxygen_file_compound.res
@@ -18,8 +18,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 
 Edge
 =type=7:PROJECT
@@ -31,8 +31,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 ----
 =to=Node
 =labels=Array(3):
@@ -43,6 +43,132 @@ Edge
 {"name":"foo"}
 
 Edge
+=type=6:PARENT
+=properties=JsonObject(0):
+{}
+----
+=from=Entity#0:
+=labels=Array(3):
+3:foo
+7:MEntity
+6:MGroup
+=properties=JsonObject(1):
+{"name":"a"}
+----
+=to=Entity#0:
+=labels=Array(3):
+3:foo
+7:MEntity
+6:MGroup
+=properties=JsonObject(1):
+{"name":"foo"}
+
+Edge
+=type=5:NESTS
+=properties=JsonObject(0):
+{}
+----
+=from=Entity#0:
+=labels=Array(3):
+3:foo
+7:MEntity
+6:MGroup
+=properties=JsonObject(1):
+{"name":"foo"}
+----
+=to=Entity#0:
+=labels=Array(3):
+3:foo
+7:MEntity
+6:MGroup
+=properties=JsonObject(1):
+{"name":"a"}
+
+Edge
+=type=6:PARENT
+=properties=JsonObject(0):
+{}
+----
+=from=Entity#10:namespacec
+=labels=Array(3):
+3:foo
+7:MEntity
+6:MGroup
+=properties=JsonObject(1):
+{"name":"c"}
+----
+=to=Entity#0:
+=labels=Array(3):
+3:foo
+7:MEntity
+6:MGroup
+=properties=JsonObject(1):
+{"name":"foo"}
+
+Edge
+=type=5:NESTS
+=properties=JsonObject(0):
+{}
+----
+=from=Entity#0:
+=labels=Array(3):
+3:foo
+7:MEntity
+6:MGroup
+=properties=JsonObject(1):
+{"name":"foo"}
+----
+=to=Entity#10:namespacec
+=labels=Array(3):
+3:foo
+7:MEntity
+6:MGroup
+=properties=JsonObject(1):
+{"name":"c"}
+
+Edge
+=type=6:PARENT
+=properties=JsonObject(0):
+{}
+----
+=from=Entity#10:namespaced
+=labels=Array(3):
+3:foo
+7:MEntity
+6:MGroup
+=properties=JsonObject(1):
+{"name":"d"}
+----
+=to=Entity#0:
+=labels=Array(3):
+3:foo
+7:MEntity
+6:MGroup
+=properties=JsonObject(1):
+{"name":"foo"}
+
+Edge
+=type=5:NESTS
+=properties=JsonObject(0):
+{}
+----
+=from=Entity#0:
+=labels=Array(3):
+3:foo
+7:MEntity
+6:MGroup
+=properties=JsonObject(1):
+{"name":"foo"}
+----
+=to=Entity#10:namespaced
+=labels=Array(3):
+3:foo
+7:MEntity
+6:MGroup
+=properties=JsonObject(1):
+{"name":"d"}
+
+Edge
 =type=8:DECLARES
 =properties=JsonObject(0):
 {}
@@ -52,8 +178,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"a::b","name":"b"}
+=properties=JsonObject(1):
+{"name":"b"}
 ----
 =to=Entity#0:
 =labels=Array(3):
@@ -61,7 +187,7 @@ Edge
 7:MEntity
 7:MModule
 =properties=JsonObject(3):
-{"location":"\/dev\/null:1,1--1,1","name":"Bar","full_name":"a::b::Bar"}
+{"location":"a/b/Bar.java:1,1--1,1","name":"Bar","mdoc":["The first file."]}
 
 Edge
 =type=10:INTRODUCES
@@ -74,7 +200,7 @@ Edge
 7:MEntity
 7:MModule
 =properties=JsonObject(3):
-{"location":"\/dev\/null:1,1--1,1","name":"Bar","full_name":"a::b::Bar"}
+{"location":"a/b/Bar.java:1,1--1,1","name":"Bar","mdoc":["The first file."]}
 ----
 =to=Entity#12:classa_b_bar
 =labels=Array(3):
@@ -82,7 +208,7 @@ Edge
 7:MEntity
 6:MClass
 =properties=JsonObject(4):
-{"kind":"class","visibility":"public","full_name":"a::b::Bar","name":"Bar"}
+{"kind":"class","visibility":"public","name":"Bar","location":"a/b/Bar.class:5,1--100,10"}
 
 Edge
 =type=7:DEFINES
@@ -95,15 +221,15 @@ Edge
 7:MEntity
 7:MModule
 =properties=JsonObject(3):
-{"location":"\/dev\/null:1,1--1,1","name":"Bar","full_name":"a::b::Bar"}
+{"location":"a/b/Bar.java:1,1--1,1","name":"Bar","mdoc":["The first file."]}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"\/dev\/null:1,1--1,1","is_intro":true,"name":"Bar","full_name":"a::b::Bar"}
+=properties=JsonObject(3):
+{"location":"a/b/Bar.class:5,1--100,10","is_intro":true,"name":"Bar"}
 
 Edge
 =type=8:DECLARES
@@ -115,16 +241,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"c","name":"c"}
+=properties=JsonObject(1):
+{"name":"c"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"\/dev\/null:1,1--1,1","name":"Bar","full_name":"c::Bar"}
+=properties=JsonObject(2):
+{"location":"Bar.java:1,1--1,1","name":"Bar"}
 
 Edge
 =type=8:DECLARES
@@ -136,16 +262,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"d","name":"d"}
+=properties=JsonObject(1):
+{"name":"d"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"\/dev\/null:1,1--1,1","name":"Bar","full_name":"d::Bar"}
+=properties=JsonObject(2):
+{"location":"Bar.java:1,1--1,1","name":"Bar"}
 
 Edge
 =type=9:CLASSTYPE
@@ -158,7 +284,7 @@ Edge
 7:MEntity
 6:MClass
 =properties=JsonObject(4):
-{"kind":"class","visibility":"public","full_name":"a::b::Bar","name":"Bar"}
+{"kind":"class","visibility":"public","name":"Bar","location":"a/b/Bar.class:5,1--100,10"}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -166,8 +292,8 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"Bar","full_name":"a::b::Bar"}
+=properties=JsonObject(1):
+{"name":"Bar"}
 
 Edge
 =type=5:CLASS
@@ -180,8 +306,8 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"Bar","full_name":"a::b::Bar"}
+=properties=JsonObject(1):
+{"name":"Bar"}
 ----
 =to=Entity#12:classa_b_bar
 =labels=Array(3):
@@ -189,7 +315,7 @@ Edge
 7:MEntity
 6:MClass
 =properties=JsonObject(4):
-{"kind":"class","visibility":"public","full_name":"a::b::Bar","name":"Bar"}
+{"kind":"class","visibility":"public","name":"Bar","location":"a/b/Bar.class:5,1--100,10"}
 
 Edge
 =type=9:BOUNDTYPE
@@ -201,8 +327,8 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"\/dev\/null:1,1--1,1","is_intro":true,"name":"Bar","full_name":"a::b::Bar"}
+=properties=JsonObject(3):
+{"location":"a/b/Bar.class:5,1--100,10","is_intro":true,"name":"Bar"}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -210,8 +336,8 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"Bar","full_name":"a::b::Bar"}
+=properties=JsonObject(1):
+{"name":"Bar"}
 
 Edge
 =type=6:MCLASS
@@ -223,8 +349,8 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"\/dev\/null:1,1--1,1","is_intro":true,"name":"Bar","full_name":"a::b::Bar"}
+=properties=JsonObject(3):
+{"location":"a/b/Bar.class:5,1--100,10","is_intro":true,"name":"Bar"}
 ----
 =to=Entity#12:classa_b_bar
 =labels=Array(3):
@@ -232,7 +358,7 @@ Edge
 7:MEntity
 6:MClass
 =properties=JsonObject(4):
-{"kind":"class","visibility":"public","full_name":"a::b::Bar","name":"Bar"}
+{"kind":"class","visibility":"public","name":"Bar","location":"a/b/Bar.class:5,1--100,10"}
 
 Edge
 =type=9:CLASSTYPE
@@ -245,7 +371,7 @@ Edge
 7:MEntity
 6:MClass
 =properties=JsonObject(4):
-{"kind":"class","visibility":"public","full_name":"Baz","name":"Baz"}
+{"kind":"class","visibility":"public","name":"Baz","location":"Baz.jar:1,1--1,1"}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -253,8 +379,8 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"Baz","full_name":"Baz"}
+=properties=JsonObject(1):
+{"name":"Baz"}
 
 Edge
 =type=5:CLASS
@@ -267,8 +393,8 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"Baz","full_name":"Baz"}
+=properties=JsonObject(1):
+{"name":"Baz"}
 ----
 =to=Entity#8:classbaz
 =labels=Array(3):
@@ -276,7 +402,7 @@ Edge
 7:MEntity
 6:MClass
 =properties=JsonObject(4):
-{"kind":"class","visibility":"public","full_name":"Baz","name":"Baz"}
+{"kind":"class","visibility":"public","name":"Baz","location":"Baz.jar:1,1--1,1"}
 
 Edge
 =type=9:BOUNDTYPE
@@ -288,8 +414,8 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"\/dev\/null:1,1--1,1","is_intro":true,"name":"Baz","full_name":"Baz"}
+=properties=JsonObject(3):
+{"location":"Baz.jar:1,1--1,1","is_intro":true,"name":"Baz"}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -297,8 +423,8 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"Baz","full_name":"Baz"}
+=properties=JsonObject(1):
+{"name":"Baz"}
 
 Edge
 =type=6:MCLASS
@@ -310,8 +436,8 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"\/dev\/null:1,1--1,1","is_intro":true,"name":"Baz","full_name":"Baz"}
+=properties=JsonObject(3):
+{"location":"Baz.jar:1,1--1,1","is_intro":true,"name":"Baz"}
 ----
 =to=Entity#8:classbaz
 =labels=Array(3):
@@ -319,7 +445,7 @@ Edge
 7:MEntity
 6:MClass
 =properties=JsonObject(4):
-{"kind":"class","visibility":"public","full_name":"Baz","name":"Baz"}
+{"kind":"class","visibility":"public","name":"Baz","location":"Baz.jar:1,1--1,1"}
 
 Edge
 =type=7:PROJECT
@@ -331,8 +457,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"a","name":"a"}
+=properties=JsonObject(1):
+{"name":"a"}
 ----
 =to=Node
 =labels=Array(3):
@@ -352,16 +478,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"a","name":"a"}
+=properties=JsonObject(1):
+{"name":"b"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"a"}
 
 Edge
 =type=5:NESTS
@@ -373,19 +499,19 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"a"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"a","name":"a"}
+=properties=JsonObject(1):
+{"name":"b"}
 
 Edge
-=type=6:PARENT
+=type=7:PROJECT
 =properties=JsonObject(0):
 {}
 ----
@@ -394,50 +520,50 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"a::b","name":"b"}
+=properties=JsonObject(1):
+{"name":"b"}
 ----
-=to=Entity#0:
+=to=Node
 =labels=Array(3):
 3:foo
 7:MEntity
-6:MGroup
-=properties=JsonObject(2):
-{"full_name":"a","name":"a"}
+8:MProject
+=properties=JsonObject(1):
+{"name":"foo"}
 
 Edge
-=type=5:NESTS
+=type=7:PROJECT
 =properties=JsonObject(0):
 {}
 ----
-=from=Entity#0:
+=from=Entity#10:namespacec
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"a","name":"a"}
+=properties=JsonObject(1):
+{"name":"c"}
 ----
-=to=Entity#0:
+=to=Node
 =labels=Array(3):
 3:foo
 7:MEntity
-6:MGroup
-=properties=JsonObject(2):
-{"full_name":"a::b","name":"b"}
+8:MProject
+=properties=JsonObject(1):
+{"name":"foo"}
 
 Edge
 =type=7:PROJECT
 =properties=JsonObject(0):
 {}
 ----
-=from=Entity#0:
+=from=Entity#10:namespaced
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"a::b","name":"b"}
+=properties=JsonObject(1):
+{"name":"d"}
 ----
 =to=Node
 =labels=Array(3):
@@ -447,50 +573,53 @@ Edge
 =properties=JsonObject(1):
 {"name":"foo"}
 
+
+---===WITH GLOBALS===---
+# Graph
 Edge
-=type=7:PROJECT
+=type=4:ROOT
 =properties=JsonObject(0):
 {}
 ----
-=from=Entity#10:namespacec
+=from=Node
 =labels=Array(3):
 3:foo
 7:MEntity
-6:MGroup
-=properties=JsonObject(2):
-{"full_name":"c","name":"c"}
+8:MProject
+=properties=JsonObject(1):
+{"name":"foo"}
 ----
-=to=Node
+=to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
-8:MProject
+6:MGroup
 =properties=JsonObject(1):
 {"name":"foo"}
 
 Edge
-=type=6:PARENT
+=type=7:PROJECT
 =properties=JsonObject(0):
 {}
 ----
-=from=Entity#10:namespacec
+=from=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"c","name":"c"}
+=properties=JsonObject(1):
+{"name":"foo"}
 ----
-=to=Entity#0:
+=to=Node
 =labels=Array(3):
 3:foo
 7:MEntity
-6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+8:MProject
+=properties=JsonObject(1):
+{"name":"foo"}
 
 Edge
-=type=5:NESTS
+=type=6:PARENT
 =properties=JsonObject(0):
 {}
 ----
@@ -499,58 +628,58 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"a"}
 ----
-=to=Entity#10:namespacec
+=to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"c","name":"c"}
+=properties=JsonObject(1):
+{"name":"foo"}
 
 Edge
-=type=7:PROJECT
+=type=5:NESTS
 =properties=JsonObject(0):
 {}
 ----
-=from=Entity#10:namespaced
+=from=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"d","name":"d"}
+=properties=JsonObject(1):
+{"name":"foo"}
 ----
-=to=Node
+=to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
-8:MProject
+6:MGroup
 =properties=JsonObject(1):
-{"name":"foo"}
+{"name":"a"}
 
 Edge
 =type=6:PARENT
 =properties=JsonObject(0):
 {}
 ----
-=from=Entity#10:namespaced
+=from=Entity#10:namespacec
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"d","name":"d"}
+=properties=JsonObject(1):
+{"name":"c"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 
 Edge
 =type=5:NESTS
@@ -562,43 +691,40 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 ----
-=to=Entity#10:namespaced
+=to=Entity#10:namespacec
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"d","name":"d"}
-
+=properties=JsonObject(1):
+{"name":"c"}
 
----===WITH GLOBALS===---
-# Graph
 Edge
-=type=4:ROOT
+=type=6:PARENT
 =properties=JsonObject(0):
 {}
 ----
-=from=Node
+=from=Entity#10:namespaced
 =labels=Array(3):
 3:foo
 7:MEntity
-8:MProject
+6:MGroup
 =properties=JsonObject(1):
-{"name":"foo"}
+{"name":"d"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 
 Edge
-=type=7:PROJECT
+=type=5:NESTS
 =properties=JsonObject(0):
 {}
 ----
@@ -607,16 +733,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 ----
-=to=Node
+=to=Entity#10:namespaced
 =labels=Array(3):
 3:foo
 7:MEntity
-8:MProject
+6:MGroup
 =properties=JsonObject(1):
-{"name":"foo"}
+{"name":"d"}
 
 Edge
 =type=8:DECLARES
@@ -628,8 +754,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"a::b","name":"b"}
+=properties=JsonObject(1):
+{"name":"b"}
 ----
 =to=Entity#0:
 =labels=Array(3):
@@ -637,7 +763,7 @@ Edge
 7:MEntity
 7:MModule
 =properties=JsonObject(3):
-{"location":"\/dev\/null:1,1--1,1","name":"Bar","full_name":"a::b::Bar"}
+{"location":"a/b/Bar.java:1,1--1,1","name":"Bar","mdoc":["The first file."]}
 
 Edge
 =type=10:INTRODUCES
@@ -650,7 +776,7 @@ Edge
 7:MEntity
 7:MModule
 =properties=JsonObject(3):
-{"location":"\/dev\/null:1,1--1,1","name":"Bar","full_name":"a::b::Bar"}
+{"location":"a/b/Bar.java:1,1--1,1","name":"Bar","mdoc":["The first file."]}
 ----
 =to=Entity#12:classa_b_bar
 =labels=Array(3):
@@ -658,7 +784,7 @@ Edge
 7:MEntity
 6:MClass
 =properties=JsonObject(4):
-{"kind":"class","visibility":"public","full_name":"a::b::Bar","name":"Bar"}
+{"kind":"class","visibility":"public","name":"Bar","location":"a/b/Bar.class:5,1--100,10"}
 
 Edge
 =type=7:DEFINES
@@ -671,15 +797,15 @@ Edge
 7:MEntity
 7:MModule
 =properties=JsonObject(3):
-{"location":"\/dev\/null:1,1--1,1","name":"Bar","full_name":"a::b::Bar"}
+{"location":"a/b/Bar.java:1,1--1,1","name":"Bar","mdoc":["The first file."]}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"\/dev\/null:1,1--1,1","is_intro":true,"name":"Bar","full_name":"a::b::Bar"}
+=properties=JsonObject(3):
+{"location":"a/b/Bar.class:5,1--100,10","is_intro":true,"name":"Bar"}
 
 Edge
 =type=8:DECLARES
@@ -691,16 +817,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"c","name":"c"}
+=properties=JsonObject(1):
+{"name":"c"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"\/dev\/null:1,1--1,1","name":"Bar","full_name":"c::Bar"}
+=properties=JsonObject(2):
+{"location":"Bar.java:1,1--1,1","name":"Bar"}
 
 Edge
 =type=8:DECLARES
@@ -712,16 +838,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"d","name":"d"}
+=properties=JsonObject(1):
+{"name":"d"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 7:MModule
-=properties=JsonObject(3):
-{"location":"\/dev\/null:1,1--1,1","name":"Bar","full_name":"d::Bar"}
+=properties=JsonObject(2):
+{"location":"Bar.java:1,1--1,1","name":"Bar"}
 
 Edge
 =type=9:CLASSTYPE
@@ -734,7 +860,7 @@ Edge
 7:MEntity
 6:MClass
 =properties=JsonObject(4):
-{"kind":"class","visibility":"public","full_name":"a::b::Bar","name":"Bar"}
+{"kind":"class","visibility":"public","name":"Bar","location":"a/b/Bar.class:5,1--100,10"}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -742,8 +868,8 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"Bar","full_name":"a::b::Bar"}
+=properties=JsonObject(1):
+{"name":"Bar"}
 
 Edge
 =type=5:CLASS
@@ -756,8 +882,8 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"Bar","full_name":"a::b::Bar"}
+=properties=JsonObject(1):
+{"name":"Bar"}
 ----
 =to=Entity#12:classa_b_bar
 =labels=Array(3):
@@ -765,7 +891,7 @@ Edge
 7:MEntity
 6:MClass
 =properties=JsonObject(4):
-{"kind":"class","visibility":"public","full_name":"a::b::Bar","name":"Bar"}
+{"kind":"class","visibility":"public","name":"Bar","location":"a/b/Bar.class:5,1--100,10"}
 
 Edge
 =type=9:BOUNDTYPE
@@ -777,8 +903,8 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"\/dev\/null:1,1--1,1","is_intro":true,"name":"Bar","full_name":"a::b::Bar"}
+=properties=JsonObject(3):
+{"location":"a/b/Bar.class:5,1--100,10","is_intro":true,"name":"Bar"}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -786,8 +912,8 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"Bar","full_name":"a::b::Bar"}
+=properties=JsonObject(1):
+{"name":"Bar"}
 
 Edge
 =type=6:MCLASS
@@ -799,8 +925,8 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"\/dev\/null:1,1--1,1","is_intro":true,"name":"Bar","full_name":"a::b::Bar"}
+=properties=JsonObject(3):
+{"location":"a/b/Bar.class:5,1--100,10","is_intro":true,"name":"Bar"}
 ----
 =to=Entity#12:classa_b_bar
 =labels=Array(3):
@@ -808,7 +934,7 @@ Edge
 7:MEntity
 6:MClass
 =properties=JsonObject(4):
-{"kind":"class","visibility":"public","full_name":"a::b::Bar","name":"Bar"}
+{"kind":"class","visibility":"public","name":"Bar","location":"a/b/Bar.class:5,1--100,10"}
 
 Edge
 =type=9:CLASSTYPE
@@ -821,7 +947,7 @@ Edge
 7:MEntity
 6:MClass
 =properties=JsonObject(4):
-{"kind":"class","visibility":"public","full_name":"Baz","name":"Baz"}
+{"kind":"class","visibility":"public","name":"Baz","location":"Baz.jar:1,1--1,1"}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -829,8 +955,8 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"Baz","full_name":"Baz"}
+=properties=JsonObject(1):
+{"name":"Baz"}
 
 Edge
 =type=5:CLASS
@@ -843,8 +969,8 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"Baz","full_name":"Baz"}
+=properties=JsonObject(1):
+{"name":"Baz"}
 ----
 =to=Entity#8:classbaz
 =labels=Array(3):
@@ -852,7 +978,7 @@ Edge
 7:MEntity
 6:MClass
 =properties=JsonObject(4):
-{"kind":"class","visibility":"public","full_name":"Baz","name":"Baz"}
+{"kind":"class","visibility":"public","name":"Baz","location":"Baz.jar:1,1--1,1"}
 
 Edge
 =type=9:BOUNDTYPE
@@ -864,8 +990,8 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"\/dev\/null:1,1--1,1","is_intro":true,"name":"Baz","full_name":"Baz"}
+=properties=JsonObject(3):
+{"location":"Baz.jar:1,1--1,1","is_intro":true,"name":"Baz"}
 ----
 =to=Entity#0:
 =labels=Array(4):
@@ -873,8 +999,8 @@ Edge
 7:MEntity
 5:MType
 10:MClassType
-=properties=JsonObject(2):
-{"name":"Baz","full_name":"Baz"}
+=properties=JsonObject(1):
+{"name":"Baz"}
 
 Edge
 =type=6:MCLASS
@@ -886,8 +1012,8 @@ Edge
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"\/dev\/null:1,1--1,1","is_intro":true,"name":"Baz","full_name":"Baz"}
+=properties=JsonObject(3):
+{"location":"Baz.jar:1,1--1,1","is_intro":true,"name":"Baz"}
 ----
 =to=Entity#8:classbaz
 =labels=Array(3):
@@ -895,7 +1021,7 @@ Edge
 7:MEntity
 6:MClass
 =properties=JsonObject(4):
-{"kind":"class","visibility":"public","full_name":"Baz","name":"Baz"}
+{"kind":"class","visibility":"public","name":"Baz","location":"Baz.jar:1,1--1,1"}
 
 Edge
 =type=7:PROJECT
@@ -907,8 +1033,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"a","name":"a"}
+=properties=JsonObject(1):
+{"name":"a"}
 ----
 =to=Node
 =labels=Array(3):
@@ -928,58 +1054,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"a","name":"a"}
-----
-=to=Entity#0:
-=labels=Array(3):
-3:foo
-7:MEntity
-6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
-
-Edge
-=type=5:NESTS
-=properties=JsonObject(0):
-{}
-----
-=from=Entity#0:
-=labels=Array(3):
-3:foo
-7:MEntity
-6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
-----
-=to=Entity#0:
-=labels=Array(3):
-3:foo
-7:MEntity
-6:MGroup
-=properties=JsonObject(2):
-{"full_name":"a","name":"a"}
-
-Edge
-=type=6:PARENT
-=properties=JsonObject(0):
-{}
-----
-=from=Entity#0:
-=labels=Array(3):
-3:foo
-7:MEntity
-6:MGroup
-=properties=JsonObject(2):
-{"full_name":"a::b","name":"b"}
+=properties=JsonObject(1):
+{"name":"b"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"a","name":"a"}
+=properties=JsonObject(1):
+{"name":"a"}
 
 Edge
 =type=5:NESTS
@@ -991,16 +1075,16 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"a","name":"a"}
+=properties=JsonObject(1):
+{"name":"a"}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"a::b","name":"b"}
+=properties=JsonObject(1):
+{"name":"b"}
 
 Edge
 =type=7:PROJECT
@@ -1012,8 +1096,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"a::b","name":"b"}
+=properties=JsonObject(1):
+{"name":"b"}
 ----
 =to=Node
 =labels=Array(3):
@@ -1033,8 +1117,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"c","name":"c"}
+=properties=JsonObject(1):
+{"name":"c"}
 ----
 =to=Node
 =labels=Array(3):
@@ -1045,48 +1129,6 @@ Edge
 {"name":"foo"}
 
 Edge
-=type=6:PARENT
-=properties=JsonObject(0):
-{}
-----
-=from=Entity#10:namespacec
-=labels=Array(3):
-3:foo
-7:MEntity
-6:MGroup
-=properties=JsonObject(2):
-{"full_name":"c","name":"c"}
-----
-=to=Entity#0:
-=labels=Array(3):
-3:foo
-7:MEntity
-6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
-
-Edge
-=type=5:NESTS
-=properties=JsonObject(0):
-{}
-----
-=from=Entity#0:
-=labels=Array(3):
-3:foo
-7:MEntity
-6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
-----
-=to=Entity#10:namespacec
-=labels=Array(3):
-3:foo
-7:MEntity
-6:MGroup
-=properties=JsonObject(2):
-{"full_name":"c","name":"c"}
-
-Edge
 =type=7:PROJECT
 =properties=JsonObject(0):
 {}
@@ -1096,8 +1138,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"d","name":"d"}
+=properties=JsonObject(1):
+{"name":"d"}
 ----
 =to=Node
 =labels=Array(3):
@@ -1108,48 +1150,6 @@ Edge
 {"name":"foo"}
 
 Edge
-=type=6:PARENT
-=properties=JsonObject(0):
-{}
-----
-=from=Entity#10:namespaced
-=labels=Array(3):
-3:foo
-7:MEntity
-6:MGroup
-=properties=JsonObject(2):
-{"full_name":"d","name":"d"}
-----
-=to=Entity#0:
-=labels=Array(3):
-3:foo
-7:MEntity
-6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
-
-Edge
-=type=5:NESTS
-=properties=JsonObject(0):
-{}
-----
-=from=Entity#0:
-=labels=Array(3):
-3:foo
-7:MEntity
-6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
-----
-=to=Entity#10:namespaced
-=labels=Array(3):
-3:foo
-7:MEntity
-6:MGroup
-=properties=JsonObject(2):
-{"full_name":"d","name":"d"}
-
-Edge
 =type=8:DECLARES
 =properties=JsonObject(0):
 {}
@@ -1159,8 +1159,8 @@ Edge
 3:foo
 7:MEntity
 6:MGroup
-=properties=JsonObject(2):
-{"full_name":"","name":"foo"}
+=properties=JsonObject(1):
+{"name":"foo"}
 ----
 =to=Entity#0:
 =labels=Array(3):
@@ -1168,7 +1168,7 @@ Edge
 7:MEntity
 7:MModule
 =properties=JsonObject(3):
-{"location":"\/dev\/null:1,1--1,1","name":"Bar","full_name":"Bar"}
+{"location":"a/b/Bar.java:1,1--1,1","name":"Bar","mdoc":["The first file."]}
 
 Edge
 =type=10:INTRODUCES
@@ -1181,7 +1181,7 @@ Edge
 7:MEntity
 7:MModule
 =properties=JsonObject(3):
-{"location":"\/dev\/null:1,1--1,1","name":"Bar","full_name":"Bar"}
+{"location":"a/b/Bar.java:1,1--1,1","name":"Bar","mdoc":["The first file."]}
 ----
 =to=Entity#8:classbaz
 =labels=Array(3):
@@ -1189,7 +1189,7 @@ Edge
 7:MEntity
 6:MClass
 =properties=JsonObject(4):
-{"kind":"class","visibility":"public","full_name":"Baz","name":"Baz"}
+{"kind":"class","visibility":"public","name":"Baz","location":"Baz.jar:1,1--1,1"}
 
 Edge
 =type=7:DEFINES
@@ -1202,14 +1202,14 @@ Edge
 7:MEntity
 7:MModule
 =properties=JsonObject(3):
-{"location":"\/dev\/null:1,1--1,1","name":"Bar","full_name":"Bar"}
+{"location":"a/b/Bar.java:1,1--1,1","name":"Bar","mdoc":["The first file."]}
 ----
 =to=Entity#0:
 =labels=Array(3):
 3:foo
 7:MEntity
 9:MClassDef
-=properties=JsonObject(4):
-{"location":"\/dev\/null:1,1--1,1","is_intro":true,"name":"Baz","full_name":"Baz"}
+=properties=JsonObject(3):
+{"location":"Baz.jar:1,1--1,1","is_intro":true,"name":"Baz"}