Added empty placeholder folders

I added a .keep file inside to make sure Github allows these folders
Merge branch 'master' into wip