Reorganize and continue implementing experiment01a stuff.