added a directory and files

Merging from the developers q branch into the upstream master