Restructure wrappers a bit to simplify the code

This also fixes #65

Now all wrappers are hanging of scope.wrappers.
Merge pull request #73 from arv/restructure-wrappers

Restructure wrappers a bit to simplify the code