changed resources structure
merged
...
merged lost changes in master