Refactoring and Nancy proj

Totally untested (thats what you get in develop branch, right?)