move method  and delete superflous file and method.
cleanup code
Merge branch 'master' of https://github.com/InnovaLangues/self into cleanup
Merge pull request #387 from arnaudbey/cleanup

Cleanup