Improving architecture.
Merge branch 'master' of https://github.com/syd26/SwissKnife33.git