Restructure samples for easier demo.