Minor project build reorganization.