Change struct network
Restruct storage
Merge pull request #55 from mirrorcoder/master

Refactoring