Refactoring package
Moving router processing to router class
Removing Router queue insertion from package and adding it to router