Big refactoring
Merge pull request #3 from mtneug/big-refactor

Big refactoring - brought by Matthias