Changes to get demo working

We need to verify that Vendor and Vendor_dev "branch" are in sync. Also I have solved misspelling in directories name and references