Moving demo to separate project