Benchmark, FileParser, Sample classes refactored. Not tested.