Cleaned up files a bit.
Revert "Cleaned up files a bit."

This reverts commit 8781b0e62b2fb5b308fb002ffc678d1568e419d2.
Cleaned up files a bit.