Revert "Some files cleanup."

This reverts commit f55dc0ef36430563d9333d4e1220065fa11ca65b.