Addes Servicepovider and moved some function to my workbench package