Make the API closer to what it was.

The previous examples were also moved to the legacy folder until
further testing is done.