A few more bug fixes, demo updates and moved the demo content to demo folder.