Fixed minor issues and merged empty header files
Updated documentation and CMakeLists