Move resource files into generik/resources
Merge branch 'fix-resource-paths'