some import re-arrangements in settings