moving code to make it correct with the mvc model

Signed-off-by: Benoit Brayer <brayer.benoit@gmail.com>
Merge branch 'master' of https://github.com/benoitBrayer/StreaMe