This reverts commit ef48898fd6.
ef48898fd6
Refactor
Updated makefile.
Refactor & cleanup
README update