diff --git a/Samples/LICENSE b/Shorewall/Samples/LICENSE
similarity index 100%
rename from Samples/LICENSE
rename to Shorewall/Samples/LICENSE
diff --git a/Samples/README.txt b/Shorewall/Samples/README.txt
similarity index 100%
rename from Samples/README.txt
rename to Shorewall/Samples/README.txt
diff --git a/Samples/Universal/interfaces b/Shorewall/Samples/Universal/interfaces
similarity index 100%
rename from Samples/Universal/interfaces
rename to Shorewall/Samples/Universal/interfaces
diff --git a/Samples/Universal/policy b/Shorewall/Samples/Universal/policy
similarity index 100%
rename from Samples/Universal/policy
rename to Shorewall/Samples/Universal/policy
diff --git a/Samples/Universal/rules b/Shorewall/Samples/Universal/rules
similarity index 100%
rename from Samples/Universal/rules
rename to Shorewall/Samples/Universal/rules
diff --git a/Samples/Universal/shorewall.conf b/Shorewall/Samples/Universal/shorewall.conf
similarity index 100%
rename from Samples/Universal/shorewall.conf
rename to Shorewall/Samples/Universal/shorewall.conf
diff --git a/Samples/Universal/zones b/Shorewall/Samples/Universal/zones
similarity index 100%
rename from Samples/Universal/zones
rename to Shorewall/Samples/Universal/zones
diff --git a/Samples/one-interface/README.txt b/Shorewall/Samples/one-interface/README.txt
similarity index 100%
rename from Samples/one-interface/README.txt
rename to Shorewall/Samples/one-interface/README.txt
diff --git a/Samples/one-interface/interfaces b/Shorewall/Samples/one-interface/interfaces
similarity index 100%
rename from Samples/one-interface/interfaces
rename to Shorewall/Samples/one-interface/interfaces
diff --git a/Samples/one-interface/policy b/Shorewall/Samples/one-interface/policy
similarity index 100%
rename from Samples/one-interface/policy
rename to Shorewall/Samples/one-interface/policy
diff --git a/Samples/one-interface/rules b/Shorewall/Samples/one-interface/rules
similarity index 100%
rename from Samples/one-interface/rules
rename to Shorewall/Samples/one-interface/rules
diff --git a/Samples/one-interface/shorewall.conf b/Shorewall/Samples/one-interface/shorewall.conf
similarity index 100%
rename from Samples/one-interface/shorewall.conf
rename to Shorewall/Samples/one-interface/shorewall.conf
diff --git a/Samples/one-interface/zones b/Shorewall/Samples/one-interface/zones
similarity index 100%
rename from Samples/one-interface/zones
rename to Shorewall/Samples/one-interface/zones
diff --git a/Samples/three-interfaces/README.txt b/Shorewall/Samples/three-interfaces/README.txt
similarity index 100%
rename from Samples/three-interfaces/README.txt
rename to Shorewall/Samples/three-interfaces/README.txt
diff --git a/Samples/three-interfaces/interfaces b/Shorewall/Samples/three-interfaces/interfaces
similarity index 100%
rename from Samples/three-interfaces/interfaces
rename to Shorewall/Samples/three-interfaces/interfaces
diff --git a/Samples/three-interfaces/masq b/Shorewall/Samples/three-interfaces/masq
similarity index 100%
rename from Samples/three-interfaces/masq
rename to Shorewall/Samples/three-interfaces/masq
diff --git a/Samples/three-interfaces/policy b/Shorewall/Samples/three-interfaces/policy
similarity index 100%
rename from Samples/three-interfaces/policy
rename to Shorewall/Samples/three-interfaces/policy
diff --git a/Samples/three-interfaces/routestopped b/Shorewall/Samples/three-interfaces/routestopped
similarity index 100%
rename from Samples/three-interfaces/routestopped
rename to Shorewall/Samples/three-interfaces/routestopped
diff --git a/Samples/three-interfaces/rules b/Shorewall/Samples/three-interfaces/rules
similarity index 100%
rename from Samples/three-interfaces/rules
rename to Shorewall/Samples/three-interfaces/rules
diff --git a/Samples/three-interfaces/shorewall.conf b/Shorewall/Samples/three-interfaces/shorewall.conf
similarity index 100%
rename from Samples/three-interfaces/shorewall.conf
rename to Shorewall/Samples/three-interfaces/shorewall.conf
diff --git a/Samples/three-interfaces/zones b/Shorewall/Samples/three-interfaces/zones
similarity index 100%
rename from Samples/three-interfaces/zones
rename to Shorewall/Samples/three-interfaces/zones
diff --git a/Samples/two-interfaces/README.txt b/Shorewall/Samples/two-interfaces/README.txt
similarity index 100%
rename from Samples/two-interfaces/README.txt
rename to Shorewall/Samples/two-interfaces/README.txt
diff --git a/Samples/two-interfaces/interfaces b/Shorewall/Samples/two-interfaces/interfaces
similarity index 100%
rename from Samples/two-interfaces/interfaces
rename to Shorewall/Samples/two-interfaces/interfaces
diff --git a/Samples/two-interfaces/masq b/Shorewall/Samples/two-interfaces/masq
similarity index 100%
rename from Samples/two-interfaces/masq
rename to Shorewall/Samples/two-interfaces/masq
diff --git a/Samples/two-interfaces/policy b/Shorewall/Samples/two-interfaces/policy
similarity index 100%
rename from Samples/two-interfaces/policy
rename to Shorewall/Samples/two-interfaces/policy
diff --git a/Samples/two-interfaces/routestopped b/Shorewall/Samples/two-interfaces/routestopped
similarity index 100%
rename from Samples/two-interfaces/routestopped
rename to Shorewall/Samples/two-interfaces/routestopped
diff --git a/Samples/two-interfaces/rules b/Shorewall/Samples/two-interfaces/rules
similarity index 100%
rename from Samples/two-interfaces/rules
rename to Shorewall/Samples/two-interfaces/rules
diff --git a/Samples/two-interfaces/shorewall.conf b/Shorewall/Samples/two-interfaces/shorewall.conf
similarity index 100%
rename from Samples/two-interfaces/shorewall.conf
rename to Shorewall/Samples/two-interfaces/shorewall.conf
diff --git a/Samples/two-interfaces/zones b/Shorewall/Samples/two-interfaces/zones
similarity index 100%
rename from Samples/two-interfaces/zones
rename to Shorewall/Samples/two-interfaces/zones
diff --git a/Samples6/LICENSE b/Shorewall6/Samples6/LICENSE
similarity index 100%
rename from Samples6/LICENSE
rename to Shorewall6/Samples6/LICENSE
diff --git a/Samples6/README.txt b/Shorewall6/Samples6/README.txt
similarity index 100%
rename from Samples6/README.txt
rename to Shorewall6/Samples6/README.txt
diff --git a/Samples6/Universal/interfaces b/Shorewall6/Samples6/Universal/interfaces
similarity index 100%
rename from Samples6/Universal/interfaces
rename to Shorewall6/Samples6/Universal/interfaces
diff --git a/Samples6/Universal/policy b/Shorewall6/Samples6/Universal/policy
similarity index 100%
rename from Samples6/Universal/policy
rename to Shorewall6/Samples6/Universal/policy
diff --git a/Samples6/Universal/rules b/Shorewall6/Samples6/Universal/rules
similarity index 100%
rename from Samples6/Universal/rules
rename to Shorewall6/Samples6/Universal/rules
diff --git a/Samples6/Universal/shorewall6.conf b/Shorewall6/Samples6/Universal/shorewall6.conf
similarity index 100%
rename from Samples6/Universal/shorewall6.conf
rename to Shorewall6/Samples6/Universal/shorewall6.conf
diff --git a/Samples6/Universal/zones b/Shorewall6/Samples6/Universal/zones
similarity index 100%
rename from Samples6/Universal/zones
rename to Shorewall6/Samples6/Universal/zones
diff --git a/Samples6/one-interface/README.txt b/Shorewall6/Samples6/one-interface/README.txt
similarity index 100%
rename from Samples6/one-interface/README.txt
rename to Shorewall6/Samples6/one-interface/README.txt
diff --git a/Samples6/one-interface/interfaces b/Shorewall6/Samples6/one-interface/interfaces
similarity index 100%
rename from Samples6/one-interface/interfaces
rename to Shorewall6/Samples6/one-interface/interfaces
diff --git a/Samples6/one-interface/policy b/Shorewall6/Samples6/one-interface/policy
similarity index 100%
rename from Samples6/one-interface/policy
rename to Shorewall6/Samples6/one-interface/policy
diff --git a/Samples6/one-interface/rules b/Shorewall6/Samples6/one-interface/rules
similarity index 100%
rename from Samples6/one-interface/rules
rename to Shorewall6/Samples6/one-interface/rules
diff --git a/Samples6/one-interface/shorewall6.conf b/Shorewall6/Samples6/one-interface/shorewall6.conf
similarity index 100%
rename from Samples6/one-interface/shorewall6.conf
rename to Shorewall6/Samples6/one-interface/shorewall6.conf
diff --git a/Samples6/one-interface/zones b/Shorewall6/Samples6/one-interface/zones
similarity index 100%
rename from Samples6/one-interface/zones
rename to Shorewall6/Samples6/one-interface/zones
diff --git a/Samples6/three-interfaces/README.txt b/Shorewall6/Samples6/three-interfaces/README.txt
similarity index 100%
rename from Samples6/three-interfaces/README.txt
rename to Shorewall6/Samples6/three-interfaces/README.txt
diff --git a/Samples6/three-interfaces/interfaces b/Shorewall6/Samples6/three-interfaces/interfaces
similarity index 100%
rename from Samples6/three-interfaces/interfaces
rename to Shorewall6/Samples6/three-interfaces/interfaces
diff --git a/Samples6/three-interfaces/policy b/Shorewall6/Samples6/three-interfaces/policy
similarity index 100%
rename from Samples6/three-interfaces/policy
rename to Shorewall6/Samples6/three-interfaces/policy
diff --git a/Samples6/three-interfaces/routestopped b/Shorewall6/Samples6/three-interfaces/routestopped
similarity index 100%
rename from Samples6/three-interfaces/routestopped
rename to Shorewall6/Samples6/three-interfaces/routestopped
diff --git a/Samples6/three-interfaces/rules b/Shorewall6/Samples6/three-interfaces/rules
similarity index 100%
rename from Samples6/three-interfaces/rules
rename to Shorewall6/Samples6/three-interfaces/rules
diff --git a/Samples6/three-interfaces/shorewall6.conf b/Shorewall6/Samples6/three-interfaces/shorewall6.conf
similarity index 100%
rename from Samples6/three-interfaces/shorewall6.conf
rename to Shorewall6/Samples6/three-interfaces/shorewall6.conf
diff --git a/Samples6/three-interfaces/zones b/Shorewall6/Samples6/three-interfaces/zones
similarity index 100%
rename from Samples6/three-interfaces/zones
rename to Shorewall6/Samples6/three-interfaces/zones
diff --git a/Samples6/two-interfaces/README.txt b/Shorewall6/Samples6/two-interfaces/README.txt
similarity index 100%
rename from Samples6/two-interfaces/README.txt
rename to Shorewall6/Samples6/two-interfaces/README.txt
diff --git a/Samples6/two-interfaces/interfaces b/Shorewall6/Samples6/two-interfaces/interfaces
similarity index 100%
rename from Samples6/two-interfaces/interfaces
rename to Shorewall6/Samples6/two-interfaces/interfaces
diff --git a/Samples6/two-interfaces/policy b/Shorewall6/Samples6/two-interfaces/policy
similarity index 100%
rename from Samples6/two-interfaces/policy
rename to Shorewall6/Samples6/two-interfaces/policy
diff --git a/Samples6/two-interfaces/routestopped b/Shorewall6/Samples6/two-interfaces/routestopped
similarity index 100%
rename from Samples6/two-interfaces/routestopped
rename to Shorewall6/Samples6/two-interfaces/routestopped
diff --git a/Samples6/two-interfaces/rules b/Shorewall6/Samples6/two-interfaces/rules
similarity index 100%
rename from Samples6/two-interfaces/rules
rename to Shorewall6/Samples6/two-interfaces/rules
diff --git a/Samples6/two-interfaces/shorewall6.conf b/Shorewall6/Samples6/two-interfaces/shorewall6.conf
similarity index 100%
rename from Samples6/two-interfaces/shorewall6.conf
rename to Shorewall6/Samples6/two-interfaces/shorewall6.conf
diff --git a/Samples6/two-interfaces/zones b/Shorewall6/Samples6/two-interfaces/zones
similarity index 100%
rename from Samples6/two-interfaces/zones
rename to Shorewall6/Samples6/two-interfaces/zones