Reorganization of the package adding benchmark directory