Removed original packages and renamed the namespace to be more appropriate for the examples.