refactored the code

[thomasgauthier]

@shamanez is the whole codebase legacy now?

[shamanez]

Was a mistake.. Now it is inside the dam folder 😬