Cleaning up the code

- Tidying up 'Eval.Worker'
- Added 'eval-service' to the package