dir re-structure; include scripts for scipy;