Chnaged demos folder structure.  Changed demos packaging structurel