file structure cleanup