FORGE-1909 refactor resource API
Merge pull request #478 from sbryzak/resource_refactoring

FORGE-1909 refactor resource API