Code clean up and restructuring of solution.
Merge branch 'master' of github.com:patriksvensson/pipes