Restructured src
Merge branch 'master' of https://github.com/st3am/baxter_barcode_pickup