Adding tau_qp work and reorganization
reorganization