Add benchmark
Module reorganization