Restructured gemfire-demo