Issues between differents implementations solved
Repo refactored.