First round of fixing dependencies and includes.
Cleaned up packaging, added cmd-line args for benchmark.