diff --git a/core/net/ahdlc.c b/core/net/ppp/ahdlc.c
similarity index 99%
rename from core/net/ahdlc.c
rename to core/net/ppp/ahdlc.c
index 23e2dc7bc..f46873af6 100644
--- a/core/net/ahdlc.c
+++ b/core/net/ppp/ahdlc.c
@@ -46,7 +46,7 @@
  *
  * This file is part of the Mycal Modified uIP TCP/IP stack.
  *
- * $Id: ahdlc.c,v 1.1 2006/06/17 22:41:18 adamdunkels Exp $
+ * $Id: ahdlc.c,v 1.1 2006/06/17 22:48:09 adamdunkels Exp $
  *
  */
 
diff --git a/core/net/ahdlc.h b/core/net/ppp/ahdlc.h
similarity index 97%
rename from core/net/ahdlc.h
rename to core/net/ppp/ahdlc.h
index 4afd895ac..22af69151 100644
--- a/core/net/ahdlc.h
+++ b/core/net/ppp/ahdlc.h
@@ -42,7 +42,7 @@
  *
  * This file is part of the Mycal Modified uIP TCP/IP stack.
  *
- * $Id: ahdlc.h,v 1.1 2006/06/17 22:41:18 adamdunkels Exp $
+ * $Id: ahdlc.h,v 1.1 2006/06/17 22:48:09 adamdunkels Exp $
  *
  */
 
diff --git a/core/net/ipcp.c b/core/net/ppp/ipcp.c
similarity index 99%
rename from core/net/ipcp.c
rename to core/net/ppp/ipcp.c
index 878c8e12d..13bdea1d6 100644
--- a/core/net/ipcp.c
+++ b/core/net/ppp/ipcp.c
@@ -47,7 +47,7 @@
  *
  * This file is part of the Mycal Modified uIP TCP/IP stack.
  *
- * $Id: ipcp.c,v 1.1 2006/06/17 22:41:18 adamdunkels Exp $
+ * $Id: ipcp.c,v 1.1 2006/06/17 22:48:09 adamdunkels Exp $
  *
  */
 
diff --git a/core/net/ipcp.h b/core/net/ppp/ipcp.h
similarity index 98%
rename from core/net/ipcp.h
rename to core/net/ppp/ipcp.h
index 70d99815d..497148f79 100644
--- a/core/net/ipcp.h
+++ b/core/net/ppp/ipcp.h
@@ -43,7 +43,7 @@
  *
  * This file is part of the Mycal Modified uIP TCP/IP stack.
  *
- * $Id: ipcp.h,v 1.1 2006/06/17 22:41:18 adamdunkels Exp $
+ * $Id: ipcp.h,v 1.1 2006/06/17 22:48:09 adamdunkels Exp $
  *
  */
 #include "net/uip.h"
diff --git a/core/net/lcp.c b/core/net/ppp/lcp.c
similarity index 99%
rename from core/net/lcp.c
rename to core/net/ppp/lcp.c
index 8818d628d..a02ca673b 100644
--- a/core/net/lcp.c
+++ b/core/net/ppp/lcp.c
@@ -44,7 +44,7 @@
  *
  * This file is part of the Mycal Modified uIP TCP/IP stack.
  *
- * $Id: lcp.c,v 1.1 2006/06/17 22:41:18 adamdunkels Exp $
+ * $Id: lcp.c,v 1.1 2006/06/17 22:48:09 adamdunkels Exp $
  *
  */
 
diff --git a/core/net/lcp.h b/core/net/ppp/lcp.h
similarity index 98%
rename from core/net/lcp.h
rename to core/net/ppp/lcp.h
index a362b861b..950a464d7 100644
--- a/core/net/lcp.h
+++ b/core/net/ppp/lcp.h
@@ -43,7 +43,7 @@
  *
  * This file is part of the Mycal Modified uIP TCP/IP stack.
  *
- * $Id: lcp.h,v 1.1 2006/06/17 22:41:18 adamdunkels Exp $
+ * $Id: lcp.h,v 1.1 2006/06/17 22:48:09 adamdunkels Exp $
  *
  */
 
diff --git a/core/net/pap.c b/core/net/ppp/pap.c
similarity index 99%
rename from core/net/pap.c
rename to core/net/ppp/pap.c
index edf5c93d4..a52a8bbf8 100644
--- a/core/net/pap.c
+++ b/core/net/ppp/pap.c
@@ -41,7 +41,7 @@
  *
  * This file is part of the Mycal Modified uIP TCP/IP stack.
  *
- * $Id: pap.c,v 1.1 2006/06/17 22:41:18 adamdunkels Exp $
+ * $Id: pap.c,v 1.1 2006/06/17 22:48:09 adamdunkels Exp $
  *
  */
 
diff --git a/core/net/pap.h b/core/net/ppp/pap.h
similarity index 97%
rename from core/net/pap.h
rename to core/net/ppp/pap.h
index a37bb01e2..8210cce14 100644
--- a/core/net/pap.h
+++ b/core/net/ppp/pap.h
@@ -44,7 +44,7 @@
  *
  * This file is part of the Mycal Modified uIP TCP/IP stack.
  *
- * $Id: pap.h,v 1.1 2006/06/17 22:41:18 adamdunkels Exp $
+ * $Id: pap.h,v 1.1 2006/06/17 22:48:09 adamdunkels Exp $
  *
  */
 
diff --git a/core/net/ppp-service.c b/core/net/ppp/ppp-service.c
similarity index 97%
rename from core/net/ppp-service.c
rename to core/net/ppp/ppp-service.c
index 9acba222e..d0489352a 100644
--- a/core/net/ppp-service.c
+++ b/core/net/ppp/ppp-service.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * @(#)$Id: ppp-service.c,v 1.1 2006/06/17 22:41:18 adamdunkels Exp $
+ * @(#)$Id: ppp-service.c,v 1.1 2006/06/17 22:48:09 adamdunkels Exp $
  */
 
 #if 0
diff --git a/core/net/ppp.c b/core/net/ppp/ppp.c
similarity index 99%
rename from core/net/ppp.c
rename to core/net/ppp/ppp.c
index bdb68d91c..88325bf85 100644
--- a/core/net/ppp.c
+++ b/core/net/ppp/ppp.c
@@ -43,7 +43,7 @@
  *
  * This file is part of the Mycal Modified uIP TCP/IP stack.
  *
- * $Id: ppp.c,v 1.1 2006/06/17 22:41:18 adamdunkels Exp $
+ * $Id: ppp.c,v 1.1 2006/06/17 22:48:09 adamdunkels Exp $
  *
  */
 
diff --git a/core/net/ppp.h b/core/net/ppp/ppp.h
similarity index 98%
rename from core/net/ppp.h
rename to core/net/ppp/ppp.h
index a44d126f0..3d32213ca 100644
--- a/core/net/ppp.h
+++ b/core/net/ppp/ppp.h
@@ -42,7 +42,7 @@
  *
  * This file is part of the Mycal Modified uIP TCP/IP stack.
  *
- * $Id: ppp.h,v 1.1 2006/06/17 22:41:18 adamdunkels Exp $
+ * $Id: ppp.h,v 1.1 2006/06/17 22:48:09 adamdunkels Exp $
  *
  */
 #include "net/uip.h"
diff --git a/core/net/ppp_process.c b/core/net/ppp/ppp_process.c
similarity index 98%
rename from core/net/ppp_process.c
rename to core/net/ppp/ppp_process.c
index e941b87fe..a3e4e7a18 100644
--- a/core/net/ppp_process.c
+++ b/core/net/ppp/ppp_process.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ppp_process.c,v 1.1 2006/06/17 22:41:18 adamdunkels Exp $
+ * $Id: ppp_process.c,v 1.1 2006/06/17 22:48:09 adamdunkels Exp $
  */
 
 #include "contiki.h"
diff --git a/core/net/ppp_process.h b/core/net/ppp/ppp_process.h
similarity index 100%
rename from core/net/ppp_process.h
rename to core/net/ppp/ppp_process.h