organizational changes, moving stuff to sage.contrib