Refactored the namespace code.
inc pkg and rebuilt