refactored various files
Merge branch 'master' of https://github.com/Cobrabb/networking