Moved all includes to /include. Added jsoncpp