rename core map structure
Merge remote-tracking branch 'origin/deleting-lines' into development