refactoring and removed iyoworks/support dependency

Signed-off-by: Blessing Osakue <iyoworks@gmail.com>