diff --git a/setup.py b/setup.py
index b000404..7df8e36 100644
--- a/setup.py
+++ b/setup.py
@@ -2,8 +2,8 @@
 
 from setuptools import setup, find_packages, Extension
 
-_wiringpi = Extension(
-    '_wiringpi',
+_wiringpi2 = Extension(
+    '_wiringpi2',
     sources=[
         'WiringPi/wiringPi/ds1302.c',
         'WiringPi/wiringPi/gertboard.c',
@@ -30,17 +30,17 @@ _wiringpi = Extension(
 )
 
 setup(
-    name = 'wiringpi',
-    version = '1.1.0',
+    name = 'wiringpi2',
+    version = '1.0.0',
     author = "Philip Howard",
     author_email = "phil@gadgetoid.com",
-    url = 'https://github.com/WiringPi/WiringPi-Python/',
-    description = """A python interface to WiringPi library which allows for
+    url = 'https://github.com/Gadgetoid/WiringPi2-Python/',
+    description = """A python interface to WiringPi 2.0 library which allows for
     easily interfacing with the GPIO pins of the Raspberry Pi. Also supports
     i2c and SPI""",
     long_description=open('README').read(),
-    ext_modules = [ _wiringpi ],
-    py_modules = ["wiringpi"],
+    ext_modules = [ _wiringpi2 ],
+    py_modules = ["wiringpi2"],
     install_requires=[],
     headers=[
         'WiringPi/wiringPi/ds1302.h',
diff --git a/wiringpi.i b/wiringpi.i
index 6d275eb..40c1644 100644
--- a/wiringpi.i
+++ b/wiringpi.i
@@ -1,25 +1,25 @@
-%module wiringpi
+%module wiringpi2
 
 %{
-#include "WiringPi/wiringPi/ds1302.h",
-#include "WiringPi/wiringPi/gertboard.h",
-#include "WiringPi/wiringPi/lcd.h",
-#include "WiringPi/wiringPi/mcp23008.h",
-#include "WiringPi/wiringPi/mcp23017.h",
-#include "WiringPi/wiringPi/mcp23s08.h",
-#include "WiringPi/wiringPi/mcp23s17.h",
-#include "WiringPi/wiringPi/mcp23x0817.h",
-#include "WiringPi/wiringPi/mcp23x08.h",
-#include "WiringPi/wiringPi/piFace.h",
-#include "WiringPi/wiringPi/piNes.h",
-#include "WiringPi/wiringPi/softPwm.h",
-#include "WiringPi/wiringPi/softServo.h",
-#include "WiringPi/wiringPi/softTone.h",
-#include "WiringPi/wiringPi/sr595.h",
-#include "WiringPi/wiringPi/wiringPi.h",
-#include "WiringPi/wiringPi/wiringPiI2C.h",
-#include "WiringPi/wiringPi/wiringPiSPI.h",
-#include "WiringPi/wiringPi/wiringSerial.h",
+#include "WiringPi/wiringPi/ds1302.h"
+#include "WiringPi/wiringPi/gertboard.h"
+#include "WiringPi/wiringPi/lcd.h"
+#include "WiringPi/wiringPi/mcp23008.h"
+#include "WiringPi/wiringPi/mcp23017.h"
+#include "WiringPi/wiringPi/mcp23s08.h"
+#include "WiringPi/wiringPi/mcp23s17.h"
+#include "WiringPi/wiringPi/mcp23x0817.h"
+#include "WiringPi/wiringPi/mcp23x08.h"
+#include "WiringPi/wiringPi/piFace.h"
+#include "WiringPi/wiringPi/piNes.h"
+#include "WiringPi/wiringPi/softPwm.h"
+#include "WiringPi/wiringPi/softServo.h"
+#include "WiringPi/wiringPi/softTone.h"
+#include "WiringPi/wiringPi/sr595.h"
+#include "WiringPi/wiringPi/wiringPi.h"
+#include "WiringPi/wiringPi/wiringPiI2C.h"
+#include "WiringPi/wiringPi/wiringPiSPI.h"
+#include "WiringPi/wiringPi/wiringSerial.h"
 #include "WiringPi/wiringPi/wiringShift.h"
 %}
 
diff --git a/wiringpi.py b/wiringpi.py
deleted file mode 100644
index 0dc402c..0000000
--- a/wiringpi.py
+++ /dev/null
@@ -1,297 +0,0 @@
-# This file was automatically generated by SWIG (http://www.swig.org).
-# Version 2.0.7
-#
-# Do not make changes to this file unless you know what you are doing--modify
-# the SWIG interface file instead.
-
-
-
-from sys import version_info
-if version_info >= (2,6,0):
-    def swig_import_helper():
-        from os.path import dirname
-        import imp
-        fp = None
-        try:
-            fp, pathname, description = imp.find_module('_wiringpi', [dirname(__file__)])
-        except ImportError:
-            import _wiringpi
-            return _wiringpi
-        if fp is not None:
-            try:
-                _mod = imp.load_module('_wiringpi', fp, pathname, description)
-            finally:
-                fp.close()
-            return _mod
-    _wiringpi = swig_import_helper()
-    del swig_import_helper
-else:
-    import _wiringpi
-del version_info
-try:
-    _swig_property = property
-except NameError:
-    pass # Python < 2.2 doesn't have 'property'.
-def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
-    if (name == "thisown"): return self.this.own(value)
-    if (name == "this"):
-        if type(value).__name__ == 'SwigPyObject':
-            self.__dict__[name] = value
-            return
-    method = class_type.__swig_setmethods__.get(name,None)
-    if method: return method(self,value)
-    if (not static):
-        self.__dict__[name] = value
-    else:
-        raise AttributeError("You cannot add attributes to %s" % self)
-
-def _swig_setattr(self,class_type,name,value):
-    return _swig_setattr_nondynamic(self,class_type,name,value,0)
-
-def _swig_getattr(self,class_type,name):
-    if (name == "thisown"): return self.this.own()
-    method = class_type.__swig_getmethods__.get(name,None)
-    if method: return method(self)
-    raise AttributeError(name)
-
-def _swig_repr(self):
-    try: strthis = "proxy of " + self.this.__repr__()
-    except: strthis = ""
-    return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
-
-try:
-    _object = object
-    _newclass = 1
-except AttributeError:
-    class _object : pass
-    _newclass = 0
-
-
-
-def wiringPiSetup():
-  return _wiringpi.wiringPiSetup()
-wiringPiSetup = _wiringpi.wiringPiSetup
-
-def wiringPiSetupSys():
-  return _wiringpi.wiringPiSetupSys()
-wiringPiSetupSys = _wiringpi.wiringPiSetupSys
-
-def wiringPiSetupGpio():
-  return _wiringpi.wiringPiSetupGpio()
-wiringPiSetupGpio = _wiringpi.wiringPiSetupGpio
-
-def piFaceSetup(*args):
-  return _wiringpi.piFaceSetup(*args)
-piFaceSetup = _wiringpi.piFaceSetup
-
-def piBoardRev():
-  return _wiringpi.piBoardRev()
-piBoardRev = _wiringpi.piBoardRev
-
-def wpiPinToGpio(*args):
-  return _wiringpi.wpiPinToGpio(*args)
-wpiPinToGpio = _wiringpi.wpiPinToGpio
-
-def pinMode(*args):
-  return _wiringpi.pinMode(*args)
-pinMode = _wiringpi.pinMode
-
-def getAlt(*args):
-  return _wiringpi.getAlt(*args)
-getAlt = _wiringpi.getAlt
-
-def pullUpDnControl(*args):
-  return _wiringpi.pullUpDnControl(*args)
-pullUpDnControl = _wiringpi.pullUpDnControl
-
-def digitalWrite(*args):
-  return _wiringpi.digitalWrite(*args)
-digitalWrite = _wiringpi.digitalWrite
-
-def digitalWriteByte(*args):
-  return _wiringpi.digitalWriteByte(*args)
-digitalWriteByte = _wiringpi.digitalWriteByte
-
-def gpioClockSet(*args):
-  return _wiringpi.gpioClockSet(*args)
-gpioClockSet = _wiringpi.gpioClockSet
-
-def pwmWrite(*args):
-  return _wiringpi.pwmWrite(*args)
-pwmWrite = _wiringpi.pwmWrite
-
-def setPadDrive(*args):
-  return _wiringpi.setPadDrive(*args)
-setPadDrive = _wiringpi.setPadDrive
-
-def digitalRead(*args):
-  return _wiringpi.digitalRead(*args)
-digitalRead = _wiringpi.digitalRead
-
-def pwmSetMode(*args):
-  return _wiringpi.pwmSetMode(*args)
-pwmSetMode = _wiringpi.pwmSetMode
-
-def pwmSetRange(*args):
-  return _wiringpi.pwmSetRange(*args)
-pwmSetRange = _wiringpi.pwmSetRange
-
-def pwmSetClock(*args):
-  return _wiringpi.pwmSetClock(*args)
-pwmSetClock = _wiringpi.pwmSetClock
-
-def wiringPiISR(*args):
-  return _wiringpi.wiringPiISR(*args)
-wiringPiISR = _wiringpi.wiringPiISR
-
-def piThreadCreate(*args):
-  return _wiringpi.piThreadCreate(*args)
-piThreadCreate = _wiringpi.piThreadCreate
-
-def piLock(*args):
-  return _wiringpi.piLock(*args)
-piLock = _wiringpi.piLock
-
-def piUnlock(*args):
-  return _wiringpi.piUnlock(*args)
-piUnlock = _wiringpi.piUnlock
-
-def delay(*args):
-  return _wiringpi.delay(*args)
-delay = _wiringpi.delay
-
-def delayMicroseconds(*args):
-  return _wiringpi.delayMicroseconds(*args)
-delayMicroseconds = _wiringpi.delayMicroseconds
-
-def millis():
-  return _wiringpi.millis()
-millis = _wiringpi.millis
-
-def micros():
-  return _wiringpi.micros()
-micros = _wiringpi.micros
-
-def serialOpen(*args):
-  return _wiringpi.serialOpen(*args)
-serialOpen = _wiringpi.serialOpen
-
-def serialClose(*args):
-  return _wiringpi.serialClose(*args)
-serialClose = _wiringpi.serialClose
-
-def serialFlush(*args):
-  return _wiringpi.serialFlush(*args)
-serialFlush = _wiringpi.serialFlush
-
-def serialPutchar(*args):
-  return _wiringpi.serialPutchar(*args)
-serialPutchar = _wiringpi.serialPutchar
-
-def serialPuts(*args):
-  return _wiringpi.serialPuts(*args)
-serialPuts = _wiringpi.serialPuts
-
-def serialPrintf(*args):
-  return _wiringpi.serialPrintf(*args)
-serialPrintf = _wiringpi.serialPrintf
-
-def serialDataAvail(*args):
-  return _wiringpi.serialDataAvail(*args)
-serialDataAvail = _wiringpi.serialDataAvail
-
-def serialGetchar(*args):
-  return _wiringpi.serialGetchar(*args)
-serialGetchar = _wiringpi.serialGetchar
-
-def shiftOut(*args):
-  return _wiringpi.shiftOut(*args)
-shiftOut = _wiringpi.shiftOut
-
-def shiftIn(*args):
-  return _wiringpi.shiftIn(*args)
-shiftIn = _wiringpi.shiftIn
-
-def wiringPiSPIGetFd(*args):
-  return _wiringpi.wiringPiSPIGetFd(*args)
-wiringPiSPIGetFd = _wiringpi.wiringPiSPIGetFd
-
-def wiringPiSPIDataRW(*args):
-  return _wiringpi.wiringPiSPIDataRW(*args)
-wiringPiSPIDataRW = _wiringpi.wiringPiSPIDataRW
-
-def wiringPiSPISetup(*args):
-  return _wiringpi.wiringPiSPISetup(*args)
-wiringPiSPISetup = _wiringpi.wiringPiSPISetup
-
-def wiringPiI2CRead(*args):
-  return _wiringpi.wiringPiI2CRead(*args)
-wiringPiI2CRead = _wiringpi.wiringPiI2CRead
-
-def wiringPiI2CReadReg8(*args):
-  return _wiringpi.wiringPiI2CReadReg8(*args)
-wiringPiI2CReadReg8 = _wiringpi.wiringPiI2CReadReg8
-
-def wiringPiI2CReadReg16(*args):
-  return _wiringpi.wiringPiI2CReadReg16(*args)
-wiringPiI2CReadReg16 = _wiringpi.wiringPiI2CReadReg16
-
-def wiringPiI2CWrite(*args):
-  return _wiringpi.wiringPiI2CWrite(*args)
-wiringPiI2CWrite = _wiringpi.wiringPiI2CWrite
-
-def wiringPiI2CWriteReg8(*args):
-  return _wiringpi.wiringPiI2CWriteReg8(*args)
-wiringPiI2CWriteReg8 = _wiringpi.wiringPiI2CWriteReg8
-
-def wiringPiI2CWriteReg16(*args):
-  return _wiringpi.wiringPiI2CWriteReg16(*args)
-wiringPiI2CWriteReg16 = _wiringpi.wiringPiI2CWriteReg16
-
-def softToneCreate(*args):
-  return _wiringpi.softToneCreate(*args)
-softToneCreate = _wiringpi.softToneCreate
-
-def softToneWrite(*args):
-  return _wiringpi.softToneWrite(*args)
-softToneWrite = _wiringpi.softToneWrite
-
-def softServoWrite(*args):
-  return _wiringpi.softServoWrite(*args)
-softServoWrite = _wiringpi.softServoWrite
-
-def softServoSetup(*args):
-  return _wiringpi.softServoSetup(*args)
-softServoSetup = _wiringpi.softServoSetup
-
-def softPwmCreate(*args):
-  return _wiringpi.softPwmCreate(*args)
-softPwmCreate = _wiringpi.softPwmCreate
-
-def softPwmWrite(*args):
-  return _wiringpi.softPwmWrite(*args)
-softPwmWrite = _wiringpi.softPwmWrite
-
-def mcp23s17Setup(*args):
-  return _wiringpi.mcp23s17Setup(*args)
-mcp23s17Setup = _wiringpi.mcp23s17Setup
-
-def mcp23017Setup(*args):
-  return _wiringpi.mcp23017Setup(*args)
-mcp23017Setup = _wiringpi.mcp23017Setup
-
-def mcp23s08Setup(*args):
-  return _wiringpi.mcp23s08Setup(*args)
-mcp23s08Setup = _wiringpi.mcp23s08Setup
-
-def mcp23008Setup(*args):
-  return _wiringpi.mcp23008Setup(*args)
-mcp23008Setup = _wiringpi.mcp23008Setup
-
-def sr595Setup(*args):
-  return _wiringpi.sr595Setup(*args)
-sr595Setup = _wiringpi.sr595Setup
-# This file is compatible with both classic and new-style classes.
-
-cvar = _wiringpi.cvar
-
diff --git a/wiringpi_wrap.c b/wiringpi_wrap.c
index 4c572e7..bce9851 100644
--- a/wiringpi_wrap.c
+++ b/wiringpi_wrap.c
@@ -2947,16 +2947,16 @@ static swig_module_info swig_module = {swig_types, 5, 0, 0, 0, 0};
 #endif
 
 /*-----------------------------------------------
-              @(target):= _wiringpi.so
+              @(target):= _wiringpi2.so
   ------------------------------------------------*/
 #if PY_VERSION_HEX >= 0x03000000
-#  define SWIG_init    PyInit__wiringpi
+#  define SWIG_init    PyInit__wiringpi2
 
 #else
-#  define SWIG_init    init_wiringpi
+#  define SWIG_init    init_wiringpi2
 
 #endif
-#define SWIG_name    "_wiringpi"
+#define SWIG_name    "_wiringpi2"
 
 #define SWIGVERSION 0x020007 
 #define SWIG_VERSION SWIGVERSION
@@ -2966,25 +2966,25 @@ static swig_module_info swig_module = {swig_types, 5, 0, 0, 0, 0};
 #define SWIG_as_voidptrptr(a) ((void)SWIG_as_voidptr(*a),(void**)(a)) 
 
 
-#include "WiringPi/wiringPi/ds1302.h",
-#include "WiringPi/wiringPi/gertboard.h",
-#include "WiringPi/wiringPi/lcd.h",
-#include "WiringPi/wiringPi/mcp23008.h",
-#include "WiringPi/wiringPi/mcp23017.h",
-#include "WiringPi/wiringPi/mcp23s08.h",
-#include "WiringPi/wiringPi/mcp23s17.h",
-#include "WiringPi/wiringPi/mcp23x0817.h",
-#include "WiringPi/wiringPi/mcp23x08.h",
-#include "WiringPi/wiringPi/piFace.h",
-#include "WiringPi/wiringPi/piNes.h",
-#include "WiringPi/wiringPi/softPwm.h",
-#include "WiringPi/wiringPi/softServo.h",
-#include "WiringPi/wiringPi/softTone.h",
-#include "WiringPi/wiringPi/sr595.h",
-#include "WiringPi/wiringPi/wiringPi.h",
-#include "WiringPi/wiringPi/wiringPiI2C.h",
-#include "WiringPi/wiringPi/wiringPiSPI.h",
-#include "WiringPi/wiringPi/wiringSerial.h",
+#include "WiringPi/wiringPi/ds1302.h"
+#include "WiringPi/wiringPi/gertboard.h"
+#include "WiringPi/wiringPi/lcd.h"
+#include "WiringPi/wiringPi/mcp23008.h"
+#include "WiringPi/wiringPi/mcp23017.h"
+#include "WiringPi/wiringPi/mcp23s08.h"
+#include "WiringPi/wiringPi/mcp23s17.h"
+#include "WiringPi/wiringPi/mcp23x0817.h"
+#include "WiringPi/wiringPi/mcp23x08.h"
+#include "WiringPi/wiringPi/piFace.h"
+#include "WiringPi/wiringPi/piNes.h"
+#include "WiringPi/wiringPi/softPwm.h"
+#include "WiringPi/wiringPi/softServo.h"
+#include "WiringPi/wiringPi/softTone.h"
+#include "WiringPi/wiringPi/sr595.h"
+#include "WiringPi/wiringPi/wiringPi.h"
+#include "WiringPi/wiringPi/wiringPiI2C.h"
+#include "WiringPi/wiringPi/wiringPiSPI.h"
+#include "WiringPi/wiringPi/wiringSerial.h"
 #include "WiringPi/wiringPi/wiringShift.h"