Redoing file structure