Refactor Code. Move Service from de-webapp to de-commons