More file structure rearranging