Reformatting file structure