Did some more file structure cleanup