Revert "delete unwanted files"

This reverts commit 75e67996ad414a7431bc074643581576416231cc.
edit tsting
edit testing 2
solve conflict