Adding benchmark script and associated directory reorganization