Restructured some of the build
Restructured some of the build

rgbkrk/binder,rgbkrk/binder,ahmadia/binder,hainm/binder,ahmadia/binder,rgbkrk/binder,hainm/binder,ahmadia/binder,rgbkrk/binder,hainm/binder,hainm/binder,ahmadia/binder