Minor project organization cleanup.