Make the rest bundle more consistent and more generic; remove useless/unused class