Reorganize files
WIP Networking Unit Tests