Restructured demo project