Refactory to a new namespace