Refactoring Restlets and moving some things around.