File structure cleanup.