Reorganized the packages int he example.