Major-Re Organization of files