Cleanup/refactor/move demo descriptions.