Clean up, rename examples