re-structured files