moving scaffold to namespace and header files