Included support for CMake and fixed src directory.
Fixed some minor formatting issues.