added some more core folders
Merge branch 'develop'