Restructured the dalek web test application
Misc changes