Factorize service stuf
Add tests structure...
fix merge