Re-arrange project folders.
Refactor some code.
Merge branch 'master' of https://github.com/francischie/FiddlerWCAT