Fix wsgi scripts for new paths.
Finish rationalizing directory structure.