Moved some picketlink classes to services