Rename files
Move demos out, "inline" function definitions.

By "demos" I mean sub-classes A and B.
Also, update other files wrt previous file rename.