[FEATURE] rest refractoring

@alexander-schranz You should have seen that, if you were running the tests :-P