Design fixes, bug fixes, renaming from demo and start for structure.