diff --git a/Makefile b/Makefile
index d16bdda..20fce2c 100644
--- a/Makefile
+++ b/Makefile
@@ -10,11 +10,11 @@ update: homepage format.css gpl-2.0.txt
 
 update-all: update yml2c yml2.py pyPEG.py backend.py yml2proc
 	if test -z $(VERSION) ; then echo VERSION not set ; exit 1 ; fi
-	rsync -avC *.py yml2c Makefile yml2proc xml2yml.ysl2 standardlib.ysl2 samples dragon:fdik.org/yml2/
-	ssh dragon bash -c "cd ; cd fdik.org/; tar cvjf yml-$(VERSION).tar.bz2 yml2/{*.py,*.yml2,*.yhtml2,format.css,gpl-2.0.txt,yml2c,Makefile,yml2proc,xml2yml.ysl2,standardlib.ysl2,samples} ; rm yml2.tar.bz2 ; ln -s yml-$(VERSION).tar.bz2 yml2.tar.bz2"
+	rsync -avC *.py yml2 yml2c Makefile yml2proc xml2yml.ysl2 standardlib.ysl2 samples dragon:fdik.org/yml2/
+	ssh dragon bash -c "cd ; cd fdik.org/; tar cvjf yml-$(VERSION).tar.bz2 yml2/{*.py,*.yml2,*.yhtml2,format.css,gpl-2.0.txt,yml2,yml2c,Makefile,yml2proc,xml2yml.ysl2,standardlib.ysl2,samples} ; rm yml2.tar.bz2 ; ln -s yml-$(VERSION).tar.bz2 yml2.tar.bz2"
 
 %.html: %.en.yhtml2 heading.en.yhtml2 homepage.en.yhtml2
 	$(YML2C) $< -o $@
 
 clean:
-	rm -f *.html *.pyc *.pyo
+	rm -f *.html *.pyc *.pyo */*.pyc */*.pyo
diff --git a/yml2.py b/yml2/__init__.py
similarity index 99%
rename from yml2.py
rename to yml2/__init__.py
index 746d6f4..82af570 100644
--- a/yml2.py
+++ b/yml2/__init__.py
@@ -3,7 +3,7 @@
 # written by VB.
 
 import re
-from pyPEG import keyword, _and, _not
+from .pyPEG import keyword, _and, _not
 
 # pyPEG:
 #
diff --git a/backend.py b/yml2/backend.py
similarity index 99%
rename from backend.py
rename to yml2/backend.py
index c8a68d9..ef96f37 100644
--- a/backend.py
+++ b/yml2/backend.py
@@ -8,8 +8,8 @@ import sys, traceback, os
 from xml.sax.saxutils import escape, quoteattr
 from copy import copy, deepcopy
 from glob import glob
-from pyPEG import code, parse, parseLine, u, Symbol
-from yml2 import ymlCStyle, comment, _inner
+from .pyPEG import code, parse, parseLine, u, Symbol
+from . import ymlCStyle, comment, _inner
 
 ymlFunc, pointers, pythonFunc = {}, {}, {}
 in_ns = ""
diff --git a/pyPEG.py b/yml2/pyPEG.py
similarity index 100%
rename from pyPEG.py
rename to yml2/pyPEG.py
diff --git a/yml2c b/yml2c
index db32e61..70fbb03 100755
--- a/yml2c
+++ b/yml2c
@@ -11,9 +11,9 @@ import sys, os, codecs, locale
 import fileinput, unicodedata
 from optparse import OptionParser
 
-from pyPEG import parse, u
+from yml2.pyPEG import parse, u
 from yml2 import ymlCStyle, comment, oldSyntax
-import backend
+import yml2.backend as backend
 
 def printInfo(option, opt_str, value, parser):
     sys.stdout.write(__doc__)
diff --git a/yml2proc b/yml2proc
index 120b1b8..95cd26a 100755
--- a/yml2proc
+++ b/yml2proc
@@ -18,8 +18,8 @@ except:
     sys.exit(1)
 
 from yml2 import ymlCStyle, comment, oldSyntax
-from pyPEG import parse, u
-import backend
+from yml2.pyPEG import parse, u
+import yml2.backend as backend
 
 def printInfo(option, opt_str, value, parser):
     sys.stdout.write(__doc__)