Refactored restful packages