Refactoring of Services into new libraries