Cleaned up the demo folder structure