final file restructure