Resource factored into service, rename module