minor file structure clean up