diff --git a/organism/excitation.md b/organism/excitation.md
index 6422da6..25564aa 100644
--- a/organism/excitation.md
+++ b/organism/excitation.md
@@ -15,9 +15,9 @@ EXCITATION
   type: container
 
   tub_intricated: 
-    PRESYNAPSE: out.{}.{}.PRESYNAPSE
-    POSTSYNAPSE: in.{}.{}.POSTSYNAPSE
-    ASTROSYNAPSE: in.{}.{}.ASTROSYNAPSE
+    PRESYNAPSE: out.{}.{}.{}.PRESYNAPSE
+    POSTSYNAPSE: in.{}.{}.{}.POSTSYNAPSE
+    ASTROSYNAPSE: in.{}.{}.{}.ASTROSYNAPSE
 ```
 
 #### TUN-PRE-POST-ASTRO-SYNAPSE: Tuner
diff --git a/organism/organism-beh.md b/organism/organism-beh.md
index 7577ed6..3c83a35 100644
--- a/organism/organism-beh.md
+++ b/organism/organism-beh.md
@@ -15,13 +15,13 @@ ORGANSIM-BEH
     elements:
 
       # Organs
-      @TECTUM: TECTUM
-      @VERTEBRAE: VERTEBRAE
-      @HYPOTHALAMUS: HYPOTHALAMUS
+      @TECTUM: TECTUM-BEH
+      @VERTEBRAE: VERTEBRAE-BEH
+      @HYPOTHALAMUS: HYPOTHALAMUS-BEH
 
     internal_intrication:
       # Area xxx
 
-      @EXCITATION-010: EXCITATION [out: @TECTUM.@WTA-001.@OUT-EXCITATION-001, in: @VERTEBREA.@WTA-001.@IN-EXCITATION-002]
+      @: EXCITATION [out: @TECTUM.@WTA-001.@OUT-EXCI-001, in: @VERTEBREA.@WTA-001.@IN-EXCI-002]
 
 ```
\ No newline at end of file
diff --git a/organism/organism.md b/organism/organism.md
index e194944..f412cee 100644
--- a/organism/organism.md
+++ b/organism/organism.md
@@ -12,16 +12,14 @@ ORGANISM
   type: comprehension
 
   include:
-    actuation.md
-    sensory.md
-    excitation.md
-    inhibition.md
-    hypothalamus.md
-    tectum.md
-    vertebrae.md
+    organism/actuation.md
+    organism/sensory.md
+    organism/excitation.md
+    organism/inhibition.md
+    hypothalamus/hypothalamus.md
+    tectum/tectum.md
+    vertebrae/vertebrae.md
 
   expansion:
-    ORGANISM-BEH
-    HYPOTHALAMUS
-
+    @ORGANISM-BEH
 ```
diff --git a/tectum/tectum-beh.md b/tectum/tectum-beh.md
index 353d86b..3ac4e71 100644
--- a/tectum/tectum-beh.md
+++ b/tectum/tectum-beh.md
@@ -15,20 +15,20 @@ TECTUM-BEH
     elements:
 
       # Modules
-      @WTA-001: WINNERTAKEALL
-      @WTA-002: WINNERTAKEALL
+      @WTA-001: WINNERTAKEALL-BEH
+      @WTA-002: WINNERTAKEALL-BEH
 
       # Astrocytes
-      @AST-001: ASTROCYTE
-      @AST-002: ASTROCYTE
+      @AST-001: ASTROCYTE-BEH
+      @AST-002: ASTROCYTE-BEH
 
     bind: [@WTA-001, @AST-001]
       
     intrications:
       # Qui l'interprete deve controllare che due o piu' "in" non sono ammessi, perche' potrebbero riguardare ASTROCYTE diversi. Da capore come fare il controllo.
       
-      @EXCITATION-010: EXCITATION [out: @WTA-001.@OUT-EXCITATION-001, in: @WTA-003.@IN-EXCITATION-002]
+      @: EXCITATION [out: @WTA-001.@OUT-EXCI-001, in: @WTA-003.@IN-EXCI-002]
 
-      @INHIBITION-012: INHIBITION [out: @WTA-002.@OUT-INHIBITION-001, in: @WTA-003.@IN-INHIBITION-004]
+      @: INHIBITION [out: @WTA-002.@OUT-INHI-001, in: @WTA-003.@IN-INHI-004]
 
 ```
\ No newline at end of file
diff --git a/winnertakeall/winnertakeall-beh.md b/winnertakeall/winnertakeall-beh.md
index d2d1c38..ba0746a 100644
--- a/winnertakeall/winnertakeall-beh.md
+++ b/winnertakeall/winnertakeall-beh.md
@@ -17,24 +17,24 @@ WINNERTAKEALL-BEH
   expansion:
 
     elements:
-
-      # Neurons
-      @NEU-005: NEURON
-      @NEU-006: NEURON
+      @NEU-005: NEURON-BEH
+      @NEU-006: NEURON-BEH
 
     intrications:
       # external intrication
-      @IN-EXCITATION-001: IN-EXCITATION [in: @NEU-001.@D-BRANCH-002, in: @NEU-002.@D-BRANCH-002]
-      @OUT-EXCITATION-001: OUT-EXCITATION [out: @NEU-001.@AXO-001, out: @NEU-002.@AXO-001]
+      @IN-EXCI-001: IN-EXCITATION [in: @NEU-001.@D-BRANCH-002, in: @NEU-002.@D-BRANCH-002]
+      @OUT-EXCI-001: OUT-EXCITATION [out: @NEU-001.@AXO-001, out: @NEU-002.@AXO-001]
+      @IN-INHI-001: IN-INHIBITION [in: @NEU-004.@SOMA, in: @NEU-003.@SOMA]
 
       # internal intrication
+
       # Area xxx
-      @EXCITATION-010: EXCITATION [out: @NEU-001.@AXON-001, in: @NEU-003.@D-BRANCH-001]
-      @EXCITATION-012: EXCITATION [out: @NEU-001.@AXON-001, in: @NEU-004.@D-BRANCH-001, in: @NEU-003.@-BRANCH-001]
-      @INHIBITION-012: INHIBITION [out: @NEU-002.@AXON-001, in: @NEU-003.@SOMA-001]
+      @: EXCITATION [out: @NEU-001.@AXON-001, in: @NEU-003.@D-BRANCH-001]
+      @: EXCITATION [out: @NEU-001.@AXON-001, in: @NEU-004.@D-BRANCH-001, in: @NEU-003.@-BRANCH-001]
+      @: INHIBITION [out: @NEU-002.@AXON-001, in: @NEU-003.@SOMA-001]
 
       # Area yyy
-      @EXCITATION-020: EXCITATION [out: @NEU-003.@AXON-001, in: @NEU-004.@D-BRANCH-003]
-      @EXCITATION-022: EXCITATION [out: @NEU-004.@AXON-001, in: @NEU-002.@D-BRANCH-001]
+      @: EXCITATION [out: @NEU-003.@AXON-001, in: @NEU-004.@D-BRANCH-003]
+      @: EXCITATION [out: @NEU-004.@AXON-001, in: @NEU-002.@D-BRANCH-001]
 
 ```