Some fine tuning, rearrangement. Still some fine tuning required though
Expanded frontend
Improved cpp implementation CMakeLists.txt