Revert "Base files and test_map"

This reverts commit b563ab2d19cbd2e52719e7ee37bfc421c65d62b1.