further file structure cleanup