S2S Refacturing

Is intended to fix #26 with sponsoring of superfeedr.

This PR is not yet merged with the latest `master`, because it break the current implementation.