some code refactoring
code refactoring
code refactoring
some refactoring and clean up
some refactoring and upstream rebased
fix import incoherence
Merge pull request #8 from massyl/master

toward more modular design :-)