v 0.6 restructure repository and mapper