trajGen reoganized