Reorganisation

Headers/Editor, Network, Misc