Revert "Delete old code dirs." The wrong code was removed

This reverts commit 1dda07574b0135ce3580e8c775d0ae467539386c.
remove old code