Development Clean Up

moving toward a more unified git structure