More tidying up.

Removed unnecessary files and renamed a few things. Added in
angular-scenario as well to make the e2e tests run.