Renaming and content organization for early demo.