Restructured demo files