package naming refractored

Signed-off-by: padjis <padjinouemmanuel@gmail.com>