major refactoring of network class, change package name again