more directory tweaking

Split code into python and ipython