Overhauled file structure