Work on Internet package
Refactoring