re-orged location IF file structure