WIP: Use RESTful module instead of RestWs

#6042