Did some file structure cleanup