Refactoring collectors

We need to merge this in order to finish the acceptance tests.

KalibroProcessor depends on this new modifications in order to work.

So we will release a RC version of this client to be used by the processor and then continue with the acceptance tests.