Update demo class' name
Move each demo to their own object