moved signal handler out into class
renamed service class
align with Version3 argument naming conventions