Add patches and restructure
Unneded testsuite dep
Merge pull request #127 from vmoravec/heart

Heartbeat - compiles with errors from includes