- file structure clean-up