Minor refactoring
Refactor resources, keep code for major refactoring
(from redmine: issue id 183, created on 2018-01-22tgradl, closed on 2018-01-22)
Refactor resources, keep code for major refactoring
(from redmine: issue id 183, created on 2018-01-22tgradl, closed on 2018-01-22)