Big refactoring. REST URI changed