Change ordering of file loading