Currently the code is a patch work with no modularity.

In order to make parts of the code sharable and contributor friendly, we have to clean up some things and eliminate basic bugs.