Rename demo classes and reorganize the packages.