Make minor organizational changes