diff --git a/Makefile b/src/Makefile
similarity index 100%
rename from Makefile
rename to src/Makefile
diff --git a/Makefile.dep b/src/Makefile.dep
similarity index 100%
rename from Makefile.dep
rename to src/Makefile.dep
diff --git a/convert/convert.h b/src/convert/convert.h
similarity index 100%
rename from convert/convert.h
rename to src/convert/convert.h
diff --git a/convert/inttostr.cpp b/src/convert/inttostr.cpp
similarity index 100%
rename from convert/inttostr.cpp
rename to src/convert/inttostr.cpp
diff --git a/convert/inttostr.h b/src/convert/inttostr.h
similarity index 100%
rename from convert/inttostr.h
rename to src/convert/inttostr.h
diff --git a/convert/misc.cpp b/src/convert/misc.cpp
similarity index 100%
rename from convert/misc.cpp
rename to src/convert/misc.cpp
diff --git a/convert/misc.h b/src/convert/misc.h
similarity index 100%
rename from convert/misc.h
rename to src/convert/misc.h
diff --git a/convert/patternreplacer.h b/src/convert/patternreplacer.h
similarity index 100%
rename from convert/patternreplacer.h
rename to src/convert/patternreplacer.h
diff --git a/convert/strtoint.h b/src/convert/strtoint.h
similarity index 100%
rename from convert/strtoint.h
rename to src/convert/strtoint.h
diff --git a/convert/text.cpp b/src/convert/text.cpp
similarity index 100%
rename from convert/text.cpp
rename to src/convert/text.cpp
diff --git a/convert/text.h b/src/convert/text.h
similarity index 100%
rename from convert/text.h
rename to src/convert/text.h
diff --git a/convert/text_private.h b/src/convert/text_private.h
similarity index 100%
rename from convert/text_private.h
rename to src/convert/text_private.h
diff --git a/date/date.cpp b/src/date/date.cpp
similarity index 100%
rename from date/date.cpp
rename to src/date/date.cpp
diff --git a/date/date.h b/src/date/date.h
similarity index 100%
rename from date/date.h
rename to src/date/date.h
diff --git a/log/filelog.cpp b/src/log/filelog.cpp
similarity index 100%
rename from log/filelog.cpp
rename to src/log/filelog.cpp
diff --git a/log/filelog.h b/src/log/filelog.h
similarity index 100%
rename from log/filelog.h
rename to src/log/filelog.h
diff --git a/log/log.cpp b/src/log/log.cpp
similarity index 100%
rename from log/log.cpp
rename to src/log/log.cpp
diff --git a/log/log.h b/src/log/log.h
similarity index 100%
rename from log/log.h
rename to src/log/log.h
diff --git a/mainspaceparser/mainspaceparser.cpp b/src/mainspaceparser/mainspaceparser.cpp
similarity index 100%
rename from mainspaceparser/mainspaceparser.cpp
rename to src/mainspaceparser/mainspaceparser.cpp
diff --git a/mainspaceparser/mainspaceparser.h b/src/mainspaceparser/mainspaceparser.h
similarity index 100%
rename from mainspaceparser/mainspaceparser.h
rename to src/mainspaceparser/mainspaceparser.h
diff --git a/membuffer/membuffer.h b/src/membuffer/membuffer.h
similarity index 100%
rename from membuffer/membuffer.h
rename to src/membuffer/membuffer.h
diff --git a/space/space.cpp b/src/space/space.cpp
similarity index 100%
rename from space/space.cpp
rename to src/space/space.cpp
diff --git a/space/space.h b/src/space/space.h
similarity index 100%
rename from space/space.h
rename to src/space/space.h
diff --git a/space/spaceparser.cpp b/src/space/spaceparser.cpp
similarity index 100%
rename from space/spaceparser.cpp
rename to src/space/spaceparser.cpp
diff --git a/space/spaceparser.h b/src/space/spaceparser.h
similarity index 100%
rename from space/spaceparser.h
rename to src/space/spaceparser.h
diff --git a/textstream/textstream.h b/src/textstream/textstream.h
similarity index 100%
rename from textstream/textstream.h
rename to src/textstream/textstream.h
diff --git a/textstream/types.h b/src/textstream/types.h
similarity index 100%
rename from textstream/types.h
rename to src/textstream/types.h
diff --git a/utf8/utf8.cpp b/src/utf8/utf8.cpp
similarity index 100%
rename from utf8/utf8.cpp
rename to src/utf8/utf8.cpp
diff --git a/utf8/utf8.h b/src/utf8/utf8.h
similarity index 100%
rename from utf8/utf8.h
rename to src/utf8/utf8.h
diff --git a/utf8/utf8_private.cpp b/src/utf8/utf8_private.cpp
similarity index 100%
rename from utf8/utf8_private.cpp
rename to src/utf8/utf8_private.cpp
diff --git a/utf8/utf8_private.h b/src/utf8/utf8_private.h
similarity index 100%
rename from utf8/utf8_private.h
rename to src/utf8/utf8_private.h
diff --git a/utf8/utf8_templates.h b/src/utf8/utf8_templates.h
similarity index 100%
rename from utf8/utf8_templates.h
rename to src/utf8/utf8_templates.h