Refactoring of packages - networking