Adding TCP, re-defining Layers, changing simulator core