move files to resources/ folder, realign pointers
Merge branch 'develop'