Adding namespace to everything and changing some class names for consistency.