Adding bundle support and richer namespace for examples