Refactored: Stop this namespace madness.
Update examples due new changes.