Restructure complete for i2c, appears to build