diff --git a/ifupdown2/KNOWN_ISSUES b/KNOWN_ISSUES
similarity index 100%
rename from ifupdown2/KNOWN_ISSUES
rename to KNOWN_ISSUES
diff --git a/ifupdown2/LICENSE b/LICENSE
similarity index 100%
rename from ifupdown2/LICENSE
rename to LICENSE
diff --git a/ifupdown2/README.rst b/README.rst
similarity index 100%
rename from ifupdown2/README.rst
rename to README.rst
diff --git a/ifupdown2/TODO b/TODO
similarity index 100%
rename from ifupdown2/TODO
rename to TODO
diff --git a/ifupdown2/addons/address.py b/addons/address.py
similarity index 100%
rename from ifupdown2/addons/address.py
rename to addons/address.py
diff --git a/ifupdown2/addons/addressvirtual.py b/addons/addressvirtual.py
similarity index 100%
rename from ifupdown2/addons/addressvirtual.py
rename to addons/addressvirtual.py
diff --git a/ifupdown2/addons/bridge.py b/addons/bridge.py
similarity index 100%
rename from ifupdown2/addons/bridge.py
rename to addons/bridge.py
diff --git a/ifupdown2/addons/bridgevlan.py b/addons/bridgevlan.py
similarity index 100%
rename from ifupdown2/addons/bridgevlan.py
rename to addons/bridgevlan.py
diff --git a/ifupdown2/addons/dhcp.py b/addons/dhcp.py
similarity index 100%
rename from ifupdown2/addons/dhcp.py
rename to addons/dhcp.py
diff --git a/ifupdown2/addons/ethtool.py b/addons/ethtool.py
similarity index 100%
rename from ifupdown2/addons/ethtool.py
rename to addons/ethtool.py
diff --git a/ifupdown2/addons/ifenslave.py b/addons/ifenslave.py
similarity index 100%
rename from ifupdown2/addons/ifenslave.py
rename to addons/ifenslave.py
diff --git a/ifupdown2/addons/loopback.py b/addons/loopback.py
similarity index 100%
rename from ifupdown2/addons/loopback.py
rename to addons/loopback.py
diff --git a/ifupdown2/addons/mstpctl.py b/addons/mstpctl.py
similarity index 100%
rename from ifupdown2/addons/mstpctl.py
rename to addons/mstpctl.py
diff --git a/ifupdown2/addons/usercmds.py b/addons/usercmds.py
similarity index 100%
rename from ifupdown2/addons/usercmds.py
rename to addons/usercmds.py
diff --git a/ifupdown2/addons/vlan.py b/addons/vlan.py
similarity index 100%
rename from ifupdown2/addons/vlan.py
rename to addons/vlan.py
diff --git a/ifupdown2/addons/vrrpd.py b/addons/vrrpd.py
similarity index 100%
rename from ifupdown2/addons/vrrpd.py
rename to addons/vrrpd.py
diff --git a/ifupdown2/addons/vxlan.py b/addons/vxlan.py
similarity index 100%
rename from ifupdown2/addons/vxlan.py
rename to addons/vxlan.py
diff --git a/ifupdown2/build.sh b/build.sh
similarity index 100%
rename from ifupdown2/build.sh
rename to build.sh
diff --git a/ifupdown2/completion/ifup b/completion/ifup
similarity index 100%
rename from ifupdown2/completion/ifup
rename to completion/ifup
diff --git a/ifupdown2/config/addons.conf b/config/addons.conf
similarity index 100%
rename from ifupdown2/config/addons.conf
rename to config/addons.conf
diff --git a/ifupdown2/config/ifupdown2.conf b/config/ifupdown2.conf
similarity index 100%
rename from ifupdown2/config/ifupdown2.conf
rename to config/ifupdown2.conf
diff --git a/ifupdown2/config/networking b/config/networking
similarity index 100%
rename from ifupdown2/config/networking
rename to config/networking
diff --git a/ifupdown2/debian/copyright b/debian/copyright
similarity index 100%
rename from ifupdown2/debian/copyright
rename to debian/copyright
diff --git a/ifupdown2/debian/python-ifupdown2.postinst b/debian/python-ifupdown2.postinst
similarity index 100%
rename from ifupdown2/debian/python-ifupdown2.postinst
rename to debian/python-ifupdown2.postinst
diff --git a/ifupdown2/debian/python-ifupdown2.postrm b/debian/python-ifupdown2.postrm
similarity index 100%
rename from ifupdown2/debian/python-ifupdown2.postrm
rename to debian/python-ifupdown2.postrm
diff --git a/ifupdown2/debian/python-ifupdown2.preinst b/debian/python-ifupdown2.preinst
similarity index 100%
rename from ifupdown2/debian/python-ifupdown2.preinst
rename to debian/python-ifupdown2.preinst
diff --git a/ifupdown2/docs/Makefile b/docs/Makefile
similarity index 100%
rename from ifupdown2/docs/Makefile
rename to docs/Makefile
diff --git a/ifupdown2/docs/examples/generate_interfaces.py b/docs/examples/generate_interfaces.py
similarity index 100%
rename from ifupdown2/docs/examples/generate_interfaces.py
rename to docs/examples/generate_interfaces.py
diff --git a/ifupdown2/docs/examples/interfaces b/docs/examples/interfaces
similarity index 100%
rename from ifupdown2/docs/examples/interfaces
rename to docs/examples/interfaces
diff --git a/ifupdown2/docs/examples/interfaces_bridge_igmp_mstp b/docs/examples/interfaces_bridge_igmp_mstp
similarity index 100%
rename from ifupdown2/docs/examples/interfaces_bridge_igmp_mstp
rename to docs/examples/interfaces_bridge_igmp_mstp
diff --git a/ifupdown2/docs/examples/interfaces_bridge_template_func b/docs/examples/interfaces_bridge_template_func
similarity index 100%
rename from ifupdown2/docs/examples/interfaces_bridge_template_func
rename to docs/examples/interfaces_bridge_template_func
diff --git a/ifupdown2/docs/examples/interfaces_with_template b/docs/examples/interfaces_with_template
similarity index 100%
rename from ifupdown2/docs/examples/interfaces_with_template
rename to docs/examples/interfaces_with_template
diff --git a/ifupdown2/docs/examples/vlan_aware_bridges/interfaces.basic b/docs/examples/vlan_aware_bridges/interfaces.basic
similarity index 100%
rename from ifupdown2/docs/examples/vlan_aware_bridges/interfaces.basic
rename to docs/examples/vlan_aware_bridges/interfaces.basic
diff --git a/ifupdown2/docs/examples/vlan_aware_bridges/interfaces.vlan_prune_and_access_ports b/docs/examples/vlan_aware_bridges/interfaces.vlan_prune_and_access_ports
similarity index 100%
rename from ifupdown2/docs/examples/vlan_aware_bridges/interfaces.vlan_prune_and_access_ports
rename to docs/examples/vlan_aware_bridges/interfaces.vlan_prune_and_access_ports
diff --git a/ifupdown2/docs/examples/vlan_aware_bridges/interfaces.with_bonds b/docs/examples/vlan_aware_bridges/interfaces.with_bonds
similarity index 100%
rename from ifupdown2/docs/examples/vlan_aware_bridges/interfaces.with_bonds
rename to docs/examples/vlan_aware_bridges/interfaces.with_bonds
diff --git a/ifupdown2/docs/examples/vlan_aware_bridges/interfaces.with_clag b/docs/examples/vlan_aware_bridges/interfaces.with_clag
similarity index 100%
rename from ifupdown2/docs/examples/vlan_aware_bridges/interfaces.with_clag
rename to docs/examples/vlan_aware_bridges/interfaces.with_clag
diff --git a/ifupdown2/docs/source/addonsapiref.rst b/docs/source/addonsapiref.rst
similarity index 100%
rename from ifupdown2/docs/source/addonsapiref.rst
rename to docs/source/addonsapiref.rst
diff --git a/ifupdown2/docs/source/addonshelperapiref.rst b/docs/source/addonshelperapiref.rst
similarity index 100%
rename from ifupdown2/docs/source/addonshelperapiref.rst
rename to docs/source/addonshelperapiref.rst
diff --git a/ifupdown2/docs/source/apiref.rst b/docs/source/apiref.rst
similarity index 100%
rename from ifupdown2/docs/source/apiref.rst
rename to docs/source/apiref.rst
diff --git a/ifupdown2/docs/source/conf.py b/docs/source/conf.py
similarity index 100%
rename from ifupdown2/docs/source/conf.py
rename to docs/source/conf.py
diff --git a/ifupdown2/docs/source/developmentcorner.rst b/docs/source/developmentcorner.rst
similarity index 100%
rename from ifupdown2/docs/source/developmentcorner.rst
rename to docs/source/developmentcorner.rst
diff --git a/ifupdown2/docs/source/gettingstarted.rst b/docs/source/gettingstarted.rst
similarity index 100%
rename from ifupdown2/docs/source/gettingstarted.rst
rename to docs/source/gettingstarted.rst
diff --git a/ifupdown2/docs/source/images/interfaces.png b/docs/source/images/interfaces.png
similarity index 100%
rename from ifupdown2/docs/source/images/interfaces.png
rename to docs/source/images/interfaces.png
diff --git a/ifupdown2/docs/source/images/interfaces_all.png b/docs/source/images/interfaces_all.png
similarity index 100%
rename from ifupdown2/docs/source/images/interfaces_all.png
rename to docs/source/images/interfaces_all.png
diff --git a/ifupdown2/docs/source/index.rst b/docs/source/index.rst
similarity index 100%
rename from ifupdown2/docs/source/index.rst
rename to docs/source/index.rst
diff --git a/ifupdown2/docs/source/intro.rst b/docs/source/intro.rst
similarity index 100%
rename from ifupdown2/docs/source/intro.rst
rename to docs/source/intro.rst
diff --git a/ifupdown2/docs/source/userguide.rst b/docs/source/userguide.rst
similarity index 100%
rename from ifupdown2/docs/source/userguide.rst
rename to docs/source/userguide.rst
diff --git a/ifupdown2/ifupdown/__init__.py b/ifupdown/__init__.py
similarity index 100%
rename from ifupdown2/ifupdown/__init__.py
rename to ifupdown/__init__.py
diff --git a/ifupdown2/ifupdown/exceptions.py b/ifupdown/exceptions.py
similarity index 100%
rename from ifupdown2/ifupdown/exceptions.py
rename to ifupdown/exceptions.py
diff --git a/ifupdown2/ifupdown/graph.py b/ifupdown/graph.py
similarity index 100%
rename from ifupdown2/ifupdown/graph.py
rename to ifupdown/graph.py
diff --git a/ifupdown2/ifupdown/iface.py b/ifupdown/iface.py
similarity index 100%
rename from ifupdown2/ifupdown/iface.py
rename to ifupdown/iface.py
diff --git a/ifupdown2/ifupdown/iff.py b/ifupdown/iff.py
similarity index 100%
rename from ifupdown2/ifupdown/iff.py
rename to ifupdown/iff.py
diff --git a/ifupdown2/ifupdown/ifupdownbase.py b/ifupdown/ifupdownbase.py
similarity index 100%
rename from ifupdown2/ifupdown/ifupdownbase.py
rename to ifupdown/ifupdownbase.py
diff --git a/ifupdown2/ifupdown/ifupdownmain.py b/ifupdown/ifupdownmain.py
similarity index 100%
rename from ifupdown2/ifupdown/ifupdownmain.py
rename to ifupdown/ifupdownmain.py
diff --git a/ifupdown2/ifupdown/netlink.py b/ifupdown/netlink.py
similarity index 100%
rename from ifupdown2/ifupdown/netlink.py
rename to ifupdown/netlink.py
diff --git a/ifupdown2/ifupdown/networkinterfaces.py b/ifupdown/networkinterfaces.py
similarity index 100%
rename from ifupdown2/ifupdown/networkinterfaces.py
rename to ifupdown/networkinterfaces.py
diff --git a/ifupdown2/ifupdown/policymanager.py b/ifupdown/policymanager.py
similarity index 100%
rename from ifupdown2/ifupdown/policymanager.py
rename to ifupdown/policymanager.py
diff --git a/ifupdown2/ifupdown/rtnetlink.py b/ifupdown/rtnetlink.py
similarity index 100%
rename from ifupdown2/ifupdown/rtnetlink.py
rename to ifupdown/rtnetlink.py
diff --git a/ifupdown2/ifupdown/rtnetlink_api.py b/ifupdown/rtnetlink_api.py
similarity index 100%
rename from ifupdown2/ifupdown/rtnetlink_api.py
rename to ifupdown/rtnetlink_api.py
diff --git a/ifupdown2/ifupdown/scheduler.py b/ifupdown/scheduler.py
similarity index 100%
rename from ifupdown2/ifupdown/scheduler.py
rename to ifupdown/scheduler.py
diff --git a/ifupdown2/ifupdown/scheduler.py.orig b/ifupdown/scheduler.py.orig
similarity index 100%
rename from ifupdown2/ifupdown/scheduler.py.orig
rename to ifupdown/scheduler.py.orig
diff --git a/ifupdown2/ifupdown/statemanager.py b/ifupdown/statemanager.py
similarity index 100%
rename from ifupdown2/ifupdown/statemanager.py
rename to ifupdown/statemanager.py
diff --git a/ifupdown2/ifupdown/template.py b/ifupdown/template.py
similarity index 100%
rename from ifupdown2/ifupdown/template.py
rename to ifupdown/template.py
diff --git a/ifupdown2/ifupdown/utils.py b/ifupdown/utils.py
similarity index 100%
rename from ifupdown2/ifupdown/utils.py
rename to ifupdown/utils.py
diff --git a/ifupdown2/ifupdownaddons/__init__.py b/ifupdownaddons/__init__.py
similarity index 100%
rename from ifupdown2/ifupdownaddons/__init__.py
rename to ifupdownaddons/__init__.py
diff --git a/ifupdown2/ifupdownaddons/bridgeutils.py b/ifupdownaddons/bridgeutils.py
similarity index 100%
rename from ifupdown2/ifupdownaddons/bridgeutils.py
rename to ifupdownaddons/bridgeutils.py
diff --git a/ifupdown2/ifupdownaddons/cache.py b/ifupdownaddons/cache.py
similarity index 100%
rename from ifupdown2/ifupdownaddons/cache.py
rename to ifupdownaddons/cache.py
diff --git a/ifupdown2/ifupdownaddons/dhclient.py b/ifupdownaddons/dhclient.py
similarity index 100%
rename from ifupdown2/ifupdownaddons/dhclient.py
rename to ifupdownaddons/dhclient.py
diff --git a/ifupdown2/ifupdownaddons/ifenslaveutil.py b/ifupdownaddons/ifenslaveutil.py
similarity index 100%
rename from ifupdown2/ifupdownaddons/ifenslaveutil.py
rename to ifupdownaddons/ifenslaveutil.py
diff --git a/ifupdown2/ifupdownaddons/iproute2.py b/ifupdownaddons/iproute2.py
similarity index 100%
rename from ifupdown2/ifupdownaddons/iproute2.py
rename to ifupdownaddons/iproute2.py
diff --git a/ifupdown2/ifupdownaddons/modulebase.py b/ifupdownaddons/modulebase.py
similarity index 100%
rename from ifupdown2/ifupdownaddons/modulebase.py
rename to ifupdownaddons/modulebase.py
diff --git a/ifupdown2/ifupdownaddons/mstpctlutil.py b/ifupdownaddons/mstpctlutil.py
similarity index 100%
rename from ifupdown2/ifupdownaddons/mstpctlutil.py
rename to ifupdownaddons/mstpctlutil.py
diff --git a/ifupdown2/ifupdownaddons/utilsbase.py b/ifupdownaddons/utilsbase.py
similarity index 100%
rename from ifupdown2/ifupdownaddons/utilsbase.py
rename to ifupdownaddons/utilsbase.py
diff --git a/ifupdown2/init.d/networking b/init.d/networking
similarity index 100%
rename from ifupdown2/init.d/networking
rename to init.d/networking
diff --git a/ifupdown2/man.rst/ifquery.8.rst b/man.rst/ifquery.8.rst
similarity index 100%
rename from ifupdown2/man.rst/ifquery.8.rst
rename to man.rst/ifquery.8.rst
diff --git a/ifupdown2/man.rst/ifreload.8.rst b/man.rst/ifreload.8.rst
similarity index 100%
rename from ifupdown2/man.rst/ifreload.8.rst
rename to man.rst/ifreload.8.rst
diff --git a/ifupdown2/man.rst/ifup.8.rst b/man.rst/ifup.8.rst
similarity index 100%
rename from ifupdown2/man.rst/ifup.8.rst
rename to man.rst/ifup.8.rst
diff --git a/ifupdown2/man.rst/ifupdown-addons-interfaces.5.rst b/man.rst/ifupdown-addons-interfaces.5.rst
similarity index 100%
rename from ifupdown2/man.rst/ifupdown-addons-interfaces.5.rst
rename to man.rst/ifupdown-addons-interfaces.5.rst
diff --git a/ifupdown2/man.rst/interfaces.5.rst b/man.rst/interfaces.5.rst
similarity index 100%
rename from ifupdown2/man.rst/interfaces.5.rst
rename to man.rst/interfaces.5.rst
diff --git a/ifupdown2/man/ifquery.8 b/man/ifquery.8
similarity index 100%
rename from ifupdown2/man/ifquery.8
rename to man/ifquery.8
diff --git a/ifupdown2/man/ifreload.8 b/man/ifreload.8
similarity index 100%
rename from ifupdown2/man/ifreload.8
rename to man/ifreload.8
diff --git a/ifupdown2/man/ifup.8 b/man/ifup.8
similarity index 100%
rename from ifupdown2/man/ifup.8
rename to man/ifup.8
diff --git a/ifupdown2/man/ifupdown-addons-interfaces.5 b/man/ifupdown-addons-interfaces.5
similarity index 100%
rename from ifupdown2/man/ifupdown-addons-interfaces.5
rename to man/ifupdown-addons-interfaces.5
diff --git a/ifupdown2/man/interfaces.5 b/man/interfaces.5
similarity index 100%
rename from ifupdown2/man/interfaces.5
rename to man/interfaces.5
diff --git a/ifupdown2/sbin/ifupdown b/sbin/ifupdown
similarity index 100%
rename from ifupdown2/sbin/ifupdown
rename to sbin/ifupdown
diff --git a/ifupdown2/scripts/genmanpages.sh b/scripts/genmanpages.sh
similarity index 100%
rename from ifupdown2/scripts/genmanpages.sh
rename to scripts/genmanpages.sh
diff --git a/ifupdown2/setup.py b/setup.py
similarity index 100%
rename from ifupdown2/setup.py
rename to setup.py
diff --git a/ifupdown2/stdeb.cfg b/stdeb.cfg
similarity index 100%
rename from ifupdown2/stdeb.cfg
rename to stdeb.cfg
diff --git a/ifupdown2/tests/ifstatetest b/tests/ifstatetest
similarity index 100%
rename from ifupdown2/tests/ifstatetest
rename to tests/ifstatetest