diff --git a/gates/and16.v b/gates/and/and16.v
similarity index 100%
rename from gates/and16.v
rename to gates/and/and16.v
diff --git a/gates/and8way.v b/gates/and/and8way.v
similarity index 100%
rename from gates/and8way.v
rename to gates/and/and8way.v
diff --git a/gates/and8way16.v b/gates/and/and8way16.v
similarity index 100%
rename from gates/and8way16.v
rename to gates/and/and8way16.v
diff --git a/gates/demux.v b/gates/demux/demux.v
similarity index 100%
rename from gates/demux.v
rename to gates/demux/demux.v
diff --git a/gates/demux16.v b/gates/demux/demux16.v
similarity index 100%
rename from gates/demux16.v
rename to gates/demux/demux16.v
diff --git a/gates/demux4way.v b/gates/demux/demux4way.v
similarity index 100%
rename from gates/demux4way.v
rename to gates/demux/demux4way.v
diff --git a/gates/demux4way16.v b/gates/demux/demux4way16.v
similarity index 100%
rename from gates/demux4way16.v
rename to gates/demux/demux4way16.v
diff --git a/gates/demux8way.v b/gates/demux/demux8way.v
similarity index 100%
rename from gates/demux8way.v
rename to gates/demux/demux8way.v
diff --git a/gates/demux8way16.v b/gates/demux/demux8way16.v
similarity index 100%
rename from gates/demux8way16.v
rename to gates/demux/demux8way16.v
diff --git a/gates/mux.v b/gates/mux/mux.v
similarity index 100%
rename from gates/mux.v
rename to gates/mux/mux.v
diff --git a/gates/mux16.v b/gates/mux/mux16.v
similarity index 100%
rename from gates/mux16.v
rename to gates/mux/mux16.v
diff --git a/gates/mux4way.v b/gates/mux/mux4way.v
similarity index 100%
rename from gates/mux4way.v
rename to gates/mux/mux4way.v
diff --git a/gates/mux4way16.v b/gates/mux/mux4way16.v
similarity index 100%
rename from gates/mux4way16.v
rename to gates/mux/mux4way16.v
diff --git a/gates/mux8way16.v b/gates/mux/mux8way16.v
similarity index 100%
rename from gates/mux8way16.v
rename to gates/mux/mux8way16.v
diff --git a/gates/nand16.v b/gates/nand/nand16.v
similarity index 100%
rename from gates/nand16.v
rename to gates/nand/nand16.v
diff --git a/gates/nand3way.v b/gates/nand/nand3way.v
similarity index 100%
rename from gates/nand3way.v
rename to gates/nand/nand3way.v
diff --git a/gates/or16.v b/gates/or/or16.v
similarity index 100%
rename from gates/or16.v
rename to gates/or/or16.v
diff --git a/gates/or4way.v b/gates/or/or4way.v
similarity index 100%
rename from gates/or4way.v
rename to gates/or/or4way.v
diff --git a/gates/or4way16.v b/gates/or/or4way16.v
similarity index 100%
rename from gates/or4way16.v
rename to gates/or/or4way16.v
diff --git a/gates/or8way.v b/gates/or/or8way.v
similarity index 100%
rename from gates/or8way.v
rename to gates/or/or8way.v
diff --git a/gates/or8way16.v b/gates/or/or8way16.v
similarity index 100%
rename from gates/or8way16.v
rename to gates/or/or8way16.v
diff --git a/gates/xnor16.v b/gates/xnor16.v
index 859d0cd..0f17251 100644
--- a/gates/xnor16.v
+++ b/gates/xnor16.v
@@ -1,22 +1,22 @@
-module or16(y16, a16, b16);
+module xnor16(y16, a16, b16);
     input [15:0] a16;
     input [15:0] b16;
     output [15:0] y16;
 
-    or(y16[0], a16[0], b16[0]);
-    or(y16[1], a16[1], b16[1]);
-    or(y16[2], a16[2], b16[2]);
-    or(y16[3], a16[3], b16[3]);
-    or(y16[4], a16[4], b16[4]);
-    or(y16[5], a16[5], b16[5]);
-    or(y16[6], a16[6], b16[6]);
-    or(y16[7], a16[7], b16[7]);
-    or(y16[8], a16[8], b16[8]);
-    or(y16[9], a16[9], b16[9]);
-    or(y16[10], a16[10], b16[10]);
-    or(y16[11], a16[11], b16[11]);
-    or(y16[12], a16[12], b16[12]);
-    or(y16[13], a16[13], b16[13]);
-    or(y16[14], a16[14], b16[14]);
-    or(y16[15], a16[15], b16[15]);
-endmodule
\ No newline at end of file
+    xnor(y16[0], a16[0], b16[0]);
+    xnor(y16[1], a16[1], b16[1]);
+    xnor(y16[2], a16[2], b16[2]);
+    xnor(y16[3], a16[3], b16[3]);
+    xnor(y16[4], a16[4], b16[4]);
+    xnor(y16[5], a16[5], b16[5]);
+    xnor(y16[6], a16[6], b16[6]);
+    xnor(y16[7], a16[7], b16[7]);
+    xnor(y16[8], a16[8], b16[8]);
+    xnor(y16[9], a16[9], b16[9]);
+    xnor(y16[10], a16[10], b16[10]);
+    xnor(y16[11], a16[11], b16[11]);
+    xnor(y16[12], a16[12], b16[12]);
+    xnor(y16[13], a16[13], b16[13]);
+    xnor(y16[14], a16[14], b16[14]);
+    xnor(y16[15], a16[15], b16[15]);
+endmodule