Refactoring of KendyNet