Updated dependencies and general cleanup.
Split resource and service.