First Prototype for coming version 2.0

Signed-off-by: Vincent Poulin-Rioux <zeroghj@gmail.com>
Update to 2.0!

Signed-off-by: Vincent Poulin-Rioux <zeroghj@gmail.com>
Merge pull request #12 from zeroghj/NewLayout

New layout