diff --git a/manpages-lite/shorewall-lite-vardir.xml b/Shorewall-lite/manpages/shorewall-lite-vardir.xml
similarity index 100%
rename from manpages-lite/shorewall-lite-vardir.xml
rename to Shorewall-lite/manpages/shorewall-lite-vardir.xml
diff --git a/manpages-lite/shorewall-lite.conf.xml b/Shorewall-lite/manpages/shorewall-lite.conf.xml
similarity index 100%
rename from manpages-lite/shorewall-lite.conf.xml
rename to Shorewall-lite/manpages/shorewall-lite.conf.xml
diff --git a/manpages-lite/shorewall-lite.xml b/Shorewall-lite/manpages/shorewall-lite.xml
similarity index 100%
rename from manpages-lite/shorewall-lite.xml
rename to Shorewall-lite/manpages/shorewall-lite.xml
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/manpages/shorewall-accounting.xml b/Shorewall/manpages/shorewall-accounting.xml
similarity index 100%
rename from manpages/shorewall-accounting.xml
rename to Shorewall/manpages/shorewall-accounting.xml
diff --git a/manpages/shorewall-actions.xml b/Shorewall/manpages/shorewall-actions.xml
similarity index 100%
rename from manpages/shorewall-actions.xml
rename to Shorewall/manpages/shorewall-actions.xml
diff --git a/manpages/shorewall-blacklist.xml b/Shorewall/manpages/shorewall-blacklist.xml
similarity index 100%
rename from manpages/shorewall-blacklist.xml
rename to Shorewall/manpages/shorewall-blacklist.xml
diff --git a/manpages/shorewall-blrules.xml b/Shorewall/manpages/shorewall-blrules.xml
similarity index 100%
rename from manpages/shorewall-blrules.xml
rename to Shorewall/manpages/shorewall-blrules.xml
diff --git a/manpages/shorewall-ecn.xml b/Shorewall/manpages/shorewall-ecn.xml
similarity index 100%
rename from manpages/shorewall-ecn.xml
rename to Shorewall/manpages/shorewall-ecn.xml
diff --git a/manpages/shorewall-exclusion.xml b/Shorewall/manpages/shorewall-exclusion.xml
similarity index 100%
rename from manpages/shorewall-exclusion.xml
rename to Shorewall/manpages/shorewall-exclusion.xml
diff --git a/manpages/shorewall-hosts.xml b/Shorewall/manpages/shorewall-hosts.xml
similarity index 100%
rename from manpages/shorewall-hosts.xml
rename to Shorewall/manpages/shorewall-hosts.xml
diff --git a/manpages/shorewall-init.xml b/Shorewall/manpages/shorewall-init.xml
similarity index 100%
rename from manpages/shorewall-init.xml
rename to Shorewall/manpages/shorewall-init.xml
diff --git a/manpages/shorewall-interfaces.xml b/Shorewall/manpages/shorewall-interfaces.xml
similarity index 100%
rename from manpages/shorewall-interfaces.xml
rename to Shorewall/manpages/shorewall-interfaces.xml
diff --git a/manpages/shorewall-ipsets.xml b/Shorewall/manpages/shorewall-ipsets.xml
similarity index 100%
rename from manpages/shorewall-ipsets.xml
rename to Shorewall/manpages/shorewall-ipsets.xml
diff --git a/manpages/shorewall-maclist.xml b/Shorewall/manpages/shorewall-maclist.xml
similarity index 100%
rename from manpages/shorewall-maclist.xml
rename to Shorewall/manpages/shorewall-maclist.xml
diff --git a/manpages/shorewall-masq.xml b/Shorewall/manpages/shorewall-masq.xml
similarity index 100%
rename from manpages/shorewall-masq.xml
rename to Shorewall/manpages/shorewall-masq.xml
diff --git a/manpages/shorewall-modules.xml b/Shorewall/manpages/shorewall-modules.xml
similarity index 100%
rename from manpages/shorewall-modules.xml
rename to Shorewall/manpages/shorewall-modules.xml
diff --git a/manpages/shorewall-nat.xml b/Shorewall/manpages/shorewall-nat.xml
similarity index 100%
rename from manpages/shorewall-nat.xml
rename to Shorewall/manpages/shorewall-nat.xml
diff --git a/manpages/shorewall-nesting.xml b/Shorewall/manpages/shorewall-nesting.xml
similarity index 100%
rename from manpages/shorewall-nesting.xml
rename to Shorewall/manpages/shorewall-nesting.xml
diff --git a/manpages/shorewall-netmap.xml b/Shorewall/manpages/shorewall-netmap.xml
similarity index 100%
rename from manpages/shorewall-netmap.xml
rename to Shorewall/manpages/shorewall-netmap.xml
diff --git a/manpages/shorewall-notrack.xml b/Shorewall/manpages/shorewall-notrack.xml
similarity index 100%
rename from manpages/shorewall-notrack.xml
rename to Shorewall/manpages/shorewall-notrack.xml
diff --git a/manpages/shorewall-params.xml b/Shorewall/manpages/shorewall-params.xml
similarity index 100%
rename from manpages/shorewall-params.xml
rename to Shorewall/manpages/shorewall-params.xml
diff --git a/manpages/shorewall-policy.xml b/Shorewall/manpages/shorewall-policy.xml
similarity index 100%
rename from manpages/shorewall-policy.xml
rename to Shorewall/manpages/shorewall-policy.xml
diff --git a/manpages/shorewall-providers.xml b/Shorewall/manpages/shorewall-providers.xml
similarity index 100%
rename from manpages/shorewall-providers.xml
rename to Shorewall/manpages/shorewall-providers.xml
diff --git a/manpages/shorewall-proxyarp.xml b/Shorewall/manpages/shorewall-proxyarp.xml
similarity index 100%
rename from manpages/shorewall-proxyarp.xml
rename to Shorewall/manpages/shorewall-proxyarp.xml
diff --git a/manpages/shorewall-routes.xml b/Shorewall/manpages/shorewall-routes.xml
similarity index 100%
rename from manpages/shorewall-routes.xml
rename to Shorewall/manpages/shorewall-routes.xml
diff --git a/manpages/shorewall-routestopped.xml b/Shorewall/manpages/shorewall-routestopped.xml
similarity index 100%
rename from manpages/shorewall-routestopped.xml
rename to Shorewall/manpages/shorewall-routestopped.xml
diff --git a/manpages/shorewall-rtrules.xml b/Shorewall/manpages/shorewall-rtrules.xml
similarity index 100%
rename from manpages/shorewall-rtrules.xml
rename to Shorewall/manpages/shorewall-rtrules.xml
diff --git a/manpages/shorewall-rules.xml b/Shorewall/manpages/shorewall-rules.xml
similarity index 100%
rename from manpages/shorewall-rules.xml
rename to Shorewall/manpages/shorewall-rules.xml
diff --git a/manpages/shorewall-secmarks.xml b/Shorewall/manpages/shorewall-secmarks.xml
similarity index 100%
rename from manpages/shorewall-secmarks.xml
rename to Shorewall/manpages/shorewall-secmarks.xml
diff --git a/manpages/shorewall-tcclasses.xml b/Shorewall/manpages/shorewall-tcclasses.xml
similarity index 100%
rename from manpages/shorewall-tcclasses.xml
rename to Shorewall/manpages/shorewall-tcclasses.xml
diff --git a/manpages/shorewall-tcdevices.xml b/Shorewall/manpages/shorewall-tcdevices.xml
similarity index 100%
rename from manpages/shorewall-tcdevices.xml
rename to Shorewall/manpages/shorewall-tcdevices.xml
diff --git a/manpages/shorewall-tcfilters.xml b/Shorewall/manpages/shorewall-tcfilters.xml
similarity index 100%
rename from manpages/shorewall-tcfilters.xml
rename to Shorewall/manpages/shorewall-tcfilters.xml
diff --git a/manpages/shorewall-tcinterfaces.xml b/Shorewall/manpages/shorewall-tcinterfaces.xml
similarity index 100%
rename from manpages/shorewall-tcinterfaces.xml
rename to Shorewall/manpages/shorewall-tcinterfaces.xml
diff --git a/manpages/shorewall-tcpri.xml b/Shorewall/manpages/shorewall-tcpri.xml
similarity index 100%
rename from manpages/shorewall-tcpri.xml
rename to Shorewall/manpages/shorewall-tcpri.xml
diff --git a/manpages/shorewall-tcrules.xml b/Shorewall/manpages/shorewall-tcrules.xml
similarity index 100%
rename from manpages/shorewall-tcrules.xml
rename to Shorewall/manpages/shorewall-tcrules.xml
diff --git a/manpages/shorewall-template.xml b/Shorewall/manpages/shorewall-template.xml
similarity index 100%
rename from manpages/shorewall-template.xml
rename to Shorewall/manpages/shorewall-template.xml
diff --git a/manpages/shorewall-tos.xml b/Shorewall/manpages/shorewall-tos.xml
similarity index 100%
rename from manpages/shorewall-tos.xml
rename to Shorewall/manpages/shorewall-tos.xml
diff --git a/manpages/shorewall-tunnels.xml b/Shorewall/manpages/shorewall-tunnels.xml
similarity index 100%
rename from manpages/shorewall-tunnels.xml
rename to Shorewall/manpages/shorewall-tunnels.xml
diff --git a/manpages/shorewall-vardir.xml b/Shorewall/manpages/shorewall-vardir.xml
similarity index 100%
rename from manpages/shorewall-vardir.xml
rename to Shorewall/manpages/shorewall-vardir.xml
diff --git a/manpages/shorewall-zones.xml b/Shorewall/manpages/shorewall-zones.xml
similarity index 100%
rename from manpages/shorewall-zones.xml
rename to Shorewall/manpages/shorewall-zones.xml
diff --git a/manpages/shorewall.conf.xml b/Shorewall/manpages/shorewall.conf.xml
similarity index 100%
rename from manpages/shorewall.conf.xml
rename to Shorewall/manpages/shorewall.conf.xml
diff --git a/manpages/shorewall.xml b/Shorewall/manpages/shorewall.xml
similarity index 100%
rename from manpages/shorewall.xml
rename to Shorewall/manpages/shorewall.xml
diff --git a/manpages6-lite/shorewall6-lite-vardir.xml b/Shorewall6-lite/manpages/shorewall6-lite-vardir.xml
similarity index 100%
rename from manpages6-lite/shorewall6-lite-vardir.xml
rename to Shorewall6-lite/manpages/shorewall6-lite-vardir.xml
diff --git a/manpages6-lite/shorewall6-lite.conf.xml b/Shorewall6-lite/manpages/shorewall6-lite.conf.xml
similarity index 100%
rename from manpages6-lite/shorewall6-lite.conf.xml
rename to Shorewall6-lite/manpages/shorewall6-lite.conf.xml
diff --git a/manpages6-lite/shorewall6-lite.xml b/Shorewall6-lite/manpages/shorewall6-lite.xml
similarity index 100%
rename from manpages6-lite/shorewall6-lite.xml
rename to Shorewall6-lite/manpages/shorewall6-lite.xml
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
diff --git a/manpages6/shorewall6-accounting.xml b/Shorewall6/manpages/shorewall6-accounting.xml
similarity index 100%
rename from manpages6/shorewall6-accounting.xml
rename to Shorewall6/manpages/shorewall6-accounting.xml
diff --git a/manpages6/shorewall6-actions.xml b/Shorewall6/manpages/shorewall6-actions.xml
similarity index 100%
rename from manpages6/shorewall6-actions.xml
rename to Shorewall6/manpages/shorewall6-actions.xml
diff --git a/manpages6/shorewall6-blacklist.xml b/Shorewall6/manpages/shorewall6-blacklist.xml
similarity index 100%
rename from manpages6/shorewall6-blacklist.xml
rename to Shorewall6/manpages/shorewall6-blacklist.xml
diff --git a/manpages6/shorewall6-blrules.xml b/Shorewall6/manpages/shorewall6-blrules.xml
similarity index 100%
rename from manpages6/shorewall6-blrules.xml
rename to Shorewall6/manpages/shorewall6-blrules.xml
diff --git a/manpages6/shorewall6-exclusion.xml b/Shorewall6/manpages/shorewall6-exclusion.xml
similarity index 100%
rename from manpages6/shorewall6-exclusion.xml
rename to Shorewall6/manpages/shorewall6-exclusion.xml
diff --git a/manpages6/shorewall6-hosts.xml b/Shorewall6/manpages/shorewall6-hosts.xml
similarity index 100%
rename from manpages6/shorewall6-hosts.xml
rename to Shorewall6/manpages/shorewall6-hosts.xml
diff --git a/manpages6/shorewall6-interfaces.xml b/Shorewall6/manpages/shorewall6-interfaces.xml
similarity index 100%
rename from manpages6/shorewall6-interfaces.xml
rename to Shorewall6/manpages/shorewall6-interfaces.xml
diff --git a/manpages6/shorewall6-ipsets.xml b/Shorewall6/manpages/shorewall6-ipsets.xml
similarity index 100%
rename from manpages6/shorewall6-ipsets.xml
rename to Shorewall6/manpages/shorewall6-ipsets.xml
diff --git a/manpages6/shorewall6-maclist.xml b/Shorewall6/manpages/shorewall6-maclist.xml
similarity index 100%
rename from manpages6/shorewall6-maclist.xml
rename to Shorewall6/manpages/shorewall6-maclist.xml
diff --git a/manpages6/shorewall6-modules.xml b/Shorewall6/manpages/shorewall6-modules.xml
similarity index 100%
rename from manpages6/shorewall6-modules.xml
rename to Shorewall6/manpages/shorewall6-modules.xml
diff --git a/manpages6/shorewall6-nesting.xml b/Shorewall6/manpages/shorewall6-nesting.xml
similarity index 100%
rename from manpages6/shorewall6-nesting.xml
rename to Shorewall6/manpages/shorewall6-nesting.xml
diff --git a/manpages6/shorewall6-netmap.xml b/Shorewall6/manpages/shorewall6-netmap.xml
similarity index 100%
rename from manpages6/shorewall6-netmap.xml
rename to Shorewall6/manpages/shorewall6-netmap.xml
diff --git a/manpages6/shorewall6-notrack.xml b/Shorewall6/manpages/shorewall6-notrack.xml
similarity index 100%
rename from manpages6/shorewall6-notrack.xml
rename to Shorewall6/manpages/shorewall6-notrack.xml
diff --git a/manpages6/shorewall6-params.xml b/Shorewall6/manpages/shorewall6-params.xml
similarity index 100%
rename from manpages6/shorewall6-params.xml
rename to Shorewall6/manpages/shorewall6-params.xml
diff --git a/manpages6/shorewall6-policy.xml b/Shorewall6/manpages/shorewall6-policy.xml
similarity index 100%
rename from manpages6/shorewall6-policy.xml
rename to Shorewall6/manpages/shorewall6-policy.xml
diff --git a/manpages6/shorewall6-providers.xml b/Shorewall6/manpages/shorewall6-providers.xml
similarity index 100%
rename from manpages6/shorewall6-providers.xml
rename to Shorewall6/manpages/shorewall6-providers.xml
diff --git a/manpages6/shorewall6-proxyndp.xml b/Shorewall6/manpages/shorewall6-proxyndp.xml
similarity index 100%
rename from manpages6/shorewall6-proxyndp.xml
rename to Shorewall6/manpages/shorewall6-proxyndp.xml
diff --git a/manpages6/shorewall6-routes.xml b/Shorewall6/manpages/shorewall6-routes.xml
similarity index 100%
rename from manpages6/shorewall6-routes.xml
rename to Shorewall6/manpages/shorewall6-routes.xml
diff --git a/manpages6/shorewall6-routestopped.xml b/Shorewall6/manpages/shorewall6-routestopped.xml
similarity index 100%
rename from manpages6/shorewall6-routestopped.xml
rename to Shorewall6/manpages/shorewall6-routestopped.xml
diff --git a/manpages6/shorewall6-rtrules.xml b/Shorewall6/manpages/shorewall6-rtrules.xml
similarity index 100%
rename from manpages6/shorewall6-rtrules.xml
rename to Shorewall6/manpages/shorewall6-rtrules.xml
diff --git a/manpages6/shorewall6-rules.xml b/Shorewall6/manpages/shorewall6-rules.xml
similarity index 100%
rename from manpages6/shorewall6-rules.xml
rename to Shorewall6/manpages/shorewall6-rules.xml
diff --git a/manpages6/shorewall6-secmarks.xml b/Shorewall6/manpages/shorewall6-secmarks.xml
similarity index 100%
rename from manpages6/shorewall6-secmarks.xml
rename to Shorewall6/manpages/shorewall6-secmarks.xml
diff --git a/manpages6/shorewall6-tcclasses.xml b/Shorewall6/manpages/shorewall6-tcclasses.xml
similarity index 100%
rename from manpages6/shorewall6-tcclasses.xml
rename to Shorewall6/manpages/shorewall6-tcclasses.xml
diff --git a/manpages6/shorewall6-tcdevices.xml b/Shorewall6/manpages/shorewall6-tcdevices.xml
similarity index 100%
rename from manpages6/shorewall6-tcdevices.xml
rename to Shorewall6/manpages/shorewall6-tcdevices.xml
diff --git a/manpages6/shorewall6-tcfilters.xml b/Shorewall6/manpages/shorewall6-tcfilters.xml
similarity index 100%
rename from manpages6/shorewall6-tcfilters.xml
rename to Shorewall6/manpages/shorewall6-tcfilters.xml
diff --git a/manpages6/shorewall6-tcinterfaces.xml b/Shorewall6/manpages/shorewall6-tcinterfaces.xml
similarity index 100%
rename from manpages6/shorewall6-tcinterfaces.xml
rename to Shorewall6/manpages/shorewall6-tcinterfaces.xml
diff --git a/manpages6/shorewall6-tcpri.xml b/Shorewall6/manpages/shorewall6-tcpri.xml
similarity index 100%
rename from manpages6/shorewall6-tcpri.xml
rename to Shorewall6/manpages/shorewall6-tcpri.xml
diff --git a/manpages6/shorewall6-tcrules.xml b/Shorewall6/manpages/shorewall6-tcrules.xml
similarity index 100%
rename from manpages6/shorewall6-tcrules.xml
rename to Shorewall6/manpages/shorewall6-tcrules.xml
diff --git a/manpages6/shorewall6-template.xml b/Shorewall6/manpages/shorewall6-template.xml
similarity index 100%
rename from manpages6/shorewall6-template.xml
rename to Shorewall6/manpages/shorewall6-template.xml
diff --git a/manpages6/shorewall6-tos.xml b/Shorewall6/manpages/shorewall6-tos.xml
similarity index 100%
rename from manpages6/shorewall6-tos.xml
rename to Shorewall6/manpages/shorewall6-tos.xml
diff --git a/manpages6/shorewall6-tunnels.xml b/Shorewall6/manpages/shorewall6-tunnels.xml
similarity index 100%
rename from manpages6/shorewall6-tunnels.xml
rename to Shorewall6/manpages/shorewall6-tunnels.xml
diff --git a/manpages6/shorewall6-vardir.xml b/Shorewall6/manpages/shorewall6-vardir.xml
similarity index 100%
rename from manpages6/shorewall6-vardir.xml
rename to Shorewall6/manpages/shorewall6-vardir.xml
diff --git a/manpages6/shorewall6-zones.xml b/Shorewall6/manpages/shorewall6-zones.xml
similarity index 100%
rename from manpages6/shorewall6-zones.xml
rename to Shorewall6/manpages/shorewall6-zones.xml
diff --git a/manpages6/shorewall6.conf.xml b/Shorewall6/manpages/shorewall6.conf.xml
similarity index 100%
rename from manpages6/shorewall6.conf.xml
rename to Shorewall6/manpages/shorewall6.conf.xml
diff --git a/manpages6/shorewall6.xml b/Shorewall6/manpages/shorewall6.xml
similarity index 100%
rename from manpages6/shorewall6.xml
rename to Shorewall6/manpages/shorewall6.xml