renamed service and moved into lib tasks