initial move of the macro to another file and namespace