Demos: Re-org & cleanup of pages