Organizing REST parsers
Merge remote-tracking branch 'remotes/origin/refactoring' into refactoring