File structure cleanup