Move DataMapper to root
update Test