Simplifiy all the things. Breaking Changes.

Signed-off-by: Luca Degasperi <luca@lucadegasperi.com>