More file structure clean up