Revert "Cleanup"

This reverts commit 9c2704888d2b6905e7a9bab9d4a882a81d51061a.
Restoring delted files