Reorganized demo project