REST refactoring.
63 files changed