some reorganization

replace destination of some textures
add map clean(not tested)