First code-review iteration
fixed subpackages and added benchmark
added benchmarks and renaming
Further cleanup/renaming/moving