diff --git a/siu/notes/notes.txt b/notes/notes.txt
similarity index 100%
rename from siu/notes/notes.txt
rename to notes/notes.txt
diff --git a/siu/l2tp/Makefile b/src/Makefile
similarity index 100%
rename from siu/l2tp/Makefile
rename to src/Makefile
diff --git a/siu/l2tp/crc32.c b/src/crc32.c
similarity index 100%
rename from siu/l2tp/crc32.c
rename to src/crc32.c
diff --git a/siu/l2tp/crc32.h b/src/crc32.h
similarity index 100%
rename from siu/l2tp/crc32.h
rename to src/crc32.h
diff --git a/siu/l2tp/l2tp_protocol.h b/src/l2tp_protocol.h
similarity index 100%
rename from siu/l2tp/l2tp_protocol.h
rename to src/l2tp_protocol.h
diff --git a/siu/l2tp/l2tpd.c b/src/l2tpd.c
similarity index 100%
rename from siu/l2tp/l2tpd.c
rename to src/l2tpd.c
diff --git a/siu/l2tp/l2tpd.h b/src/l2tpd.h
similarity index 100%
rename from siu/l2tp/l2tpd.h
rename to src/l2tpd.h
diff --git a/siu/l2tp/l2tpd_data.c b/src/l2tpd_data.c
similarity index 100%
rename from siu/l2tp/l2tpd_data.c
rename to src/l2tpd_data.c
diff --git a/siu/l2tp/l2tpd_data.h b/src/l2tpd_data.h
similarity index 100%
rename from siu/l2tp/l2tpd_data.h
rename to src/l2tpd_data.h
diff --git a/siu/l2tp/l2tpd_fsm.c b/src/l2tpd_fsm.c
similarity index 100%
rename from siu/l2tp/l2tpd_fsm.c
rename to src/l2tpd_fsm.c
diff --git a/siu/l2tp/l2tpd_fsm.h b/src/l2tpd_fsm.h
similarity index 100%
rename from siu/l2tp/l2tpd_fsm.h
rename to src/l2tpd_fsm.h
diff --git a/siu/l2tp/l2tpd_lapd.c b/src/l2tpd_lapd.c
similarity index 100%
rename from siu/l2tp/l2tpd_lapd.c
rename to src/l2tpd_lapd.c
diff --git a/siu/l2tp/l2tpd_lapd.h b/src/l2tpd_lapd.h
similarity index 100%
rename from siu/l2tp/l2tpd_lapd.h
rename to src/l2tpd_lapd.h
diff --git a/siu/l2tp/l2tpd_logging.c b/src/l2tpd_logging.c
similarity index 100%
rename from siu/l2tp/l2tpd_logging.c
rename to src/l2tpd_logging.c
diff --git a/siu/l2tp/l2tpd_logging.h b/src/l2tpd_logging.h
similarity index 100%
rename from siu/l2tp/l2tpd_logging.h
rename to src/l2tpd_logging.h
diff --git a/siu/l2tp/l2tpd_packet.c b/src/l2tpd_packet.c
similarity index 100%
rename from siu/l2tp/l2tpd_packet.c
rename to src/l2tpd_packet.c
diff --git a/siu/l2tp/l2tpd_packet.h b/src/l2tpd_packet.h
similarity index 100%
rename from siu/l2tp/l2tpd_packet.h
rename to src/l2tpd_packet.h
diff --git a/siu/l2tp/l2tpd_socket.c b/src/l2tpd_socket.c
similarity index 100%
rename from siu/l2tp/l2tpd_socket.c
rename to src/l2tpd_socket.c
diff --git a/siu/l2tp/l2tpd_socket.h b/src/l2tpd_socket.h
similarity index 100%
rename from siu/l2tp/l2tpd_socket.h
rename to src/l2tpd_socket.h
diff --git a/siu/l2tp/rfc/l2tp-parameters.txt b/src/rfc/l2tp-parameters.txt
similarity index 100%
rename from siu/l2tp/rfc/l2tp-parameters.txt
rename to src/rfc/l2tp-parameters.txt
diff --git a/siu/l2tp/rfc/rfc3931.txt b/src/rfc/rfc3931.txt
similarity index 100%
rename from siu/l2tp/rfc/rfc3931.txt
rename to src/rfc/rfc3931.txt
diff --git a/siu/l2tp/rfc/rfc5641.txt b/src/rfc/rfc5641.txt
similarity index 100%
rename from siu/l2tp/rfc/rfc5641.txt
rename to src/rfc/rfc5641.txt
diff --git a/siu/l2tp/test_connect.c b/src/test_connect.c
similarity index 100%
rename from siu/l2tp/test_connect.c
rename to src/test_connect.c
diff --git a/siu/l2tp/unixsocket_proto.h b/src/unixsocket_proto.h
similarity index 100%
rename from siu/l2tp/unixsocket_proto.h
rename to src/unixsocket_proto.h