api updates, reorganization