More file structure changes