TODO has been taken care of.
Fixed a typo.
Removed unused std::vector.
Rearranged Makefile targets.
Refactoring, split smoke and perf tests.