Rearranged project files to separate demo classes.