Minor restructuring, moved primary repo to nelsam