Redefining services
Renamme classes :)
Merge branch 'services_checkout' into develop