diff --git a/drivers/i2c/ads1015_driver_test.go b/drivers/i2c/ads1015_driver_test.go
deleted file mode 100644
index bff12178..00000000
--- a/drivers/i2c/ads1015_driver_test.go
+++ /dev/null
@@ -1,134 +0,0 @@
-package i2c
-
-import (
-	"errors"
-	"testing"
-
-	"gobot.io/x/gobot"
-	"gobot.io/x/gobot/drivers/aio"
-	"gobot.io/x/gobot/gobottest"
-)
-
-// the ADS1015Driver is a Driver
-var _ gobot.Driver = (*ADS1015Driver)(nil)
-
-// that supports the AnalogReader interface
-var _ aio.AnalogReader = (*ADS1015Driver)(nil)
-
-// --------- HELPERS
-func initTestADS1015Driver() (driver *ADS1015Driver) {
-	driver, _ = initTestADS1015DriverWithStubbedAdaptor()
-	return
-}
-
-func initTestADS1015DriverWithStubbedAdaptor() (*ADS1015Driver, *i2cTestAdaptor) {
-	adaptor := newI2cTestAdaptor()
-	return NewADS1015Driver(adaptor), adaptor
-}
-
-// --------- BASE TESTS
-func TestNewADS1015Driver(t *testing.T) {
-	// Does it return a pointer to an instance of ADS1015Driver?
-	var bm interface{} = NewADS1015Driver(newI2cTestAdaptor())
-	_, ok := bm.(*ADS1015Driver)
-	if !ok {
-		t.Errorf("NewADS1015Driver() should have returned a *ADS1015Driver")
-	}
-}
-
-func TestADS1015DriverSetName(t *testing.T) {
-	d := initTestADS1015Driver()
-	d.SetName("TESTME")
-	gobottest.Assert(t, d.Name(), "TESTME")
-}
-
-func TestADS1015DriverOptions(t *testing.T) {
-	d := NewADS1015Driver(newI2cTestAdaptor(), WithBus(2), WithADS1015Gain(ADS1015RegConfigPga2048V))
-	gobottest.Assert(t, d.GetBusOrDefault(1), 2)
-	gobottest.Assert(t, d.gain, uint16(ADS1015RegConfigPga2048V))
-}
-
-func TestADS1015StartAndHalt(t *testing.T) {
-	d, _ := initTestADS1015DriverWithStubbedAdaptor()
-	gobottest.Assert(t, d.Start(), nil)
-	gobottest.Assert(t, d.Halt(), nil)
-}
-
-func TestADS1015StartConnectError(t *testing.T) {
-	d, adaptor := initTestADS1015DriverWithStubbedAdaptor()
-	adaptor.Testi2cConnectErr(true)
-	gobottest.Assert(t, d.Start(), errors.New("Invalid i2c connection"))
-}
-
-// --------- DRIVER SPECIFIC TESTS
-
-func TestADS1015DriverAnalogRead(t *testing.T) {
-	d, adaptor := initTestADS1015DriverWithStubbedAdaptor()
-	d.Start()
-
-	adaptor.i2cReadImpl = func(b []byte) (int, error) {
-		copy(b, []byte{99, 1})
-		return 2, nil
-	}
-
-	val, err := d.AnalogRead("0")
-	gobottest.Assert(t, val, 1584)
-	gobottest.Assert(t, err, nil)
-
-	val, err = d.AnalogRead("1")
-	gobottest.Assert(t, val, 1584)
-	gobottest.Assert(t, err, nil)
-
-	val, err = d.AnalogRead("2")
-	gobottest.Assert(t, val, 1584)
-	gobottest.Assert(t, err, nil)
-
-	val, err = d.AnalogRead("3")
-	gobottest.Assert(t, val, 1584)
-	gobottest.Assert(t, err, nil)
-
-	val, err = d.AnalogRead("0-1")
-	gobottest.Assert(t, val, 1584)
-	gobottest.Assert(t, err, nil)
-
-	val, err = d.AnalogRead("2-3")
-	gobottest.Assert(t, val, 1584)
-	gobottest.Assert(t, err, nil)
-}
-
-func TestADS1015DriverAnalogReadError(t *testing.T) {
-	d, a := initTestADS1015DriverWithStubbedAdaptor()
-	d.Start()
-
-	a.i2cReadImpl = func(b []byte) (int, error) {
-		return 0, errors.New("read error")
-	}
-
-	_, err := d.AnalogRead("0")
-	gobottest.Assert(t, err, errors.New("read error"))
-}
-
-func TestADS1015DriverAnalogReadInvalidPin(t *testing.T) {
-	d, _ := initTestADS1015DriverWithStubbedAdaptor()
-
-	_, err := d.AnalogRead("99")
-	gobottest.Assert(t, err, errors.New("Invalid channel."))
-}
-
-func TestADS1015DriverAnalogReadWriteError(t *testing.T) {
-	d, a := initTestADS1015DriverWithStubbedAdaptor()
-	d.Start()
-
-	a.i2cWriteImpl = func([]byte) (int, error) {
-		return 0, errors.New("write error")
-	}
-
-	_, err := d.AnalogRead("0")
-	gobottest.Assert(t, err, errors.New("write error"))
-
-	_, err = d.AnalogRead("0-1")
-	gobottest.Assert(t, err, errors.New("write error"))
-
-	_, err = d.AnalogRead("2-3")
-	gobottest.Assert(t, err, errors.New("write error"))
-}
diff --git a/drivers/i2c/ads1x15.go b/drivers/i2c/ads1x15.go
deleted file mode 100644
index c85d5de7..00000000
--- a/drivers/i2c/ads1x15.go
+++ /dev/null
@@ -1,278 +0,0 @@
-package i2c
-
-import (
-	"errors"
-	"time"
-
-	"fmt"
-
-	"gobot.io/x/gobot"
-)
-
-const (
-
-	// I2C address
-	ads1x15Address                  = 0x48
-	ADS1x15_DEFAULT_ADDRESS         = 0x48
-	ADS1x15_POINTER_CONVERSION      = 0x00
-	ADS1x15_POINTER_CONFIG          = 0x01
-	ADS1x15_POINTER_LOW_THRESHOLD   = 0x02
-	ADS1x15_POINTER_HIGH_THRESHOLD  = 0x03
-	ADS1x15_CONFIG_OS_SINGLE        = 0x8000
-	ADS1x15_CONFIG_MUX_OFFSET       = 12
-	ADS1x15_CONFIG_MODE_CONTINUOUS  = 0x0000
-	ADS1x15_CONFIG_MODE_SINGLE      = 0x0100
-	ADS1x15_CONFIG_COMP_WINDOW      = 0x0010
-	ADS1x15_CONFIG_COMP_ACTIVE_HIGH = 0x0008
-	ADS1x15_CONFIG_COMP_LATCHING    = 0x0004
-	ADS1x15_CONFIG_COMP_QUE_DISABLE = 0x0003
-)
-
-// ADS1x15Driver is the Gobot driver for the ADS1015/ADS1115 ADC
-type ADS1x15Driver struct {
-	name            string
-	connector       Connector
-	connection      Connection
-	gainConfig      map[int]uint16
-	dataRates       map[int]uint16
-	gainVoltage     map[int]float64
-	converter       func([]byte) float64
-	DefaultGain     int
-	DefaultDataRate int
-	Config
-}
-
-// NewADS1015Driver creates a new driver for the ADS1015 (12-bit ADC)
-// Largely inspired by: https://github.com/adafruit/Adafruit_Python_ADS1x15
-func NewADS1015Driver(a Connector, options ...func(Config)) *ADS1x15Driver {
-	l := newADS1x15Driver(a, options...)
-
-	l.dataRates = map[int]uint16{
-		128:  0x0000,
-		250:  0x0020,
-		490:  0x0040,
-		920:  0x0060,
-		1600: 0x0080,
-		2400: 0x00A0,
-		3300: 0x00C0,
-	}
-	if l.DefaultDataRate == 0 {
-		l.DefaultDataRate = 1600
-	}
-
-	l.converter = func(data []byte) (value float64) {
-		result := (int(data[0]) << 8) | int(data[1])
-
-		if result&0x8000 != 0 {
-			result -= 1 << 16
-		}
-
-		return float64(result) / float64(1<<12)
-	}
-
-	return l
-}
-
-// NewADS1115Driver creates a new driver for the ADS1115 (16-bit ADC)
-func NewADS1115Driver(a Connector, options ...func(Config)) *ADS1x15Driver {
-	l := newADS1x15Driver(a, options...)
-
-	l.dataRates = map[int]uint16{
-		8:   0x0000,
-		16:  0x0020,
-		32:  0x0040,
-		64:  0x0060,
-		128: 0x0080,
-		250: 0x00A0,
-		475: 0x00C0,
-		860: 0x00E0,
-	}
-
-	if l.DefaultDataRate == 0 {
-		l.DefaultDataRate = 128
-	}
-
-	l.converter = func(data []byte) (value float64) {
-		result := (int(data[0]) << 8) | int(data[1])
-
-		if result&0x8000 != 0 {
-			result -= 1 << 16
-		}
-
-		return float64(result) / float64(1<<15)
-	}
-
-	return l
-}
-
-func newADS1x15Driver(a Connector, options ...func(Config)) *ADS1x15Driver {
-	l := &ADS1x15Driver{
-		name:      gobot.DefaultName("ADS1x15"),
-		connector: a,
-		// Mapping of gain values to config register values.
-		gainConfig: map[int]uint16{
-			2 / 3: 0x0000,
-			1:     0x0200,
-			2:     0x0400,
-			4:     0x0600,
-			8:     0x0800,
-			16:    0x0A00,
-		},
-		gainVoltage: map[int]float64{
-			2 / 3: 6.144,
-			1:     4.096,
-			2:     2.048,
-			4:     1.024,
-			8:     0.512,
-			16:    0.256,
-		},
-		DefaultGain: 1,
-
-		Config: NewConfig(),
-	}
-
-	for _, option := range options {
-		option(l)
-	}
-
-	// TODO: add commands to API
-	return l
-}
-
-// Start initializes the sensor
-func (d *ADS1x15Driver) Start() (err error) {
-	bus := d.GetBusOrDefault(d.connector.GetDefaultBus())
-	address := d.GetAddressOrDefault(ads1x15Address)
-
-	if d.connection, err = d.connector.GetConnection(address, bus); err != nil {
-		return err
-	}
-
-	return
-}
-
-// Name returns the Name for the Driver
-func (d *ADS1x15Driver) Name() string { return d.name }
-
-// SetName sets the Name for the Driver
-func (d *ADS1x15Driver) SetName(n string) { d.name = n }
-
-// Connection returns the connection for the Driver
-func (d *ADS1x15Driver) Connection() gobot.Connection { return d.connector.(gobot.Connection) }
-
-// Halt returns true if devices is halted successfully
-func (d *ADS1x15Driver) Halt() (err error) { return }
-
-// ReadDifferenceWithDefaults reads the difference in V between 2 inputs. It uses the default gain and data rate
-// diff can be:
-// * 0: Channel 0 - channel 1
-// * 1: Channel 0 - channel 3
-// * 2: Channel 1 - channel 3
-// * 3: Channel 2 - channel 3
-func (d *ADS1x15Driver) ReadDifferenceWithDefaults(diff int) (value float64, err error) {
-	return d.ReadDifference(diff, d.DefaultGain, d.DefaultDataRate)
-}
-
-// ReadDifference reads the difference in V between 2 inputs.
-// diff can be:
-// * 0: Channel 0 - channel 1
-// * 1: Channel 0 - channel 3
-// * 2: Channel 1 - channel 3
-// * 3: Channel 2 - channel 3
-func (d *ADS1x15Driver) ReadDifference(diff int, gain int, dataRate int) (value float64, err error) {
-	if err = d.checkChannel(diff); err != nil {
-		return
-	}
-
-	return d.rawRead(diff, gain, dataRate)
-}
-
-// ReadWithDefaults reads the voltage at the specified channel (between 0 and 3).
-// Default values are used for the gain and data rate. The result is in V.
-func (d *ADS1x15Driver) ReadWithDefaults(channel int) (value float64, err error) {
-	return d.Read(channel, d.DefaultGain, d.DefaultDataRate)
-}
-
-// Read reads the voltage at the specified channel (between 0 and 3). The result is in V.
-func (d *ADS1x15Driver) Read(channel int, gain int, dataRate int) (value float64, err error) {
-	if err = d.checkChannel(channel); err != nil {
-		return
-	}
-	mux := channel + 0x04
-
-	return d.rawRead(mux, gain, dataRate)
-}
-
-func (d *ADS1x15Driver) rawRead(mux int, gain int, dataRate int) (value float64, err error) {
-	var config uint16
-	config = ADS1x15_CONFIG_OS_SINGLE // Go out of power-down mode for conversion.
-	// Specify mux value.
-	config |= uint16((mux & 0x07) << ADS1x15_CONFIG_MUX_OFFSET)
-	// Validate the passed in gain and then set it in the config.
-
-	gainConf, ok := d.gainConfig[gain]
-
-	if !ok {
-		err = errors.New("Gain must be one of: 2/3, 1, 2, 4, 8, 16")
-		return
-	}
-	config |= gainConf
-	// Set the mode (continuous or single shot).
-	config |= ADS1x15_CONFIG_MODE_SINGLE
-	// Get the default data rate if none is specified (default differs between
-	// ADS1015 and ADS1115).
-	dataRateConf, ok := d.dataRates[dataRate]
-
-	if !ok {
-		keys := []int{}
-		for k := range d.dataRates {
-			keys = append(keys, k)
-		}
-
-		err = fmt.Errorf("Invalid data rate. Accepted values: %d", keys)
-		return
-	}
-	// Set the data rate (this is controlled by the subclass as it differs
-	// between ADS1015 and ADS1115).
-	config |= dataRateConf
-	config |= ADS1x15_CONFIG_COMP_QUE_DISABLE // Disable comparator mode.
-
-	// Send the config value to start the ADC conversion.
-	// Explicitly break the 16-bit value down to a big endian pair of bytes.
-	if _, err = d.connection.Write([]byte{ADS1x15_POINTER_CONFIG, byte((config >> 8) & 0xFF), byte(config & 0xFF)}); err != nil {
-		return
-	}
-
-	// Wait for the ADC sample to finish based on the sample rate plus a
-	// small offset to be sure (0.1 millisecond).
-	time.Sleep(time.Duration(1000000/dataRate+100) * time.Microsecond)
-
-	// Retrieve the result.
-	if _, err = d.connection.Write([]byte{ADS1x15_POINTER_CONVERSION}); err != nil {
-		return
-	}
-
-	data := make([]byte, 2)
-	_, err = d.connection.Read(data)
-	if err != nil {
-		return
-	}
-
-	voltageMultiplier, ok := d.gainVoltage[gain]
-
-	if !ok {
-		err = errors.New("Gain must be one of: 2/3, 1, 2, 4, 8, 16")
-		return
-	}
-
-	value = d.converter(data) * voltageMultiplier
-
-	return
-}
-
-func (d *ADS1x15Driver) checkChannel(channel int) (err error) {
-	if channel < 0 || channel > 3 {
-		err = errors.New("Invalid channel, must be between 0 and 3")
-	}
-	return
-}