reorganized structure and added map move refresh