Move unconditional file loads to composer