move non-scipy stuff to numpy directory
move scipy stuff back...