Re-organize mappigns