Update reqs for IPython Notebook
Reorg dirs, add ipynb stuff