Refactoring proposal

I let you see what I've donne on the full library. And it's working ;-)