gedi refactor changes, new demo files