add sourcetree and reorder a bit