One last file structure tweak.