added new layout to get ready for multiple IPs and better organisation. Also added TestClient