Re-organize prefereces