Created generic factory, and io units
Merge remote-tracking branch 'origin/master'