Deleted unnecessary files originated in dibi and renamed base class to highlight forking