diff --git a/src/applesoftfile.cxx b/src/applesoftfile/applesoftfile.cxx
similarity index 100%
rename from src/applesoftfile.cxx
rename to src/applesoftfile/applesoftfile.cxx
diff --git a/src/applesoftfile.h b/src/applesoftfile/applesoftfile.h
similarity index 100%
rename from src/applesoftfile.h
rename to src/applesoftfile/applesoftfile.h
diff --git a/src/applesofttoken.cxx b/src/applesoftfile/applesofttoken.cxx
similarity index 100%
rename from src/applesofttoken.cxx
rename to src/applesoftfile/applesofttoken.cxx
diff --git a/src/applesofttoken.h b/src/applesoftfile/applesofttoken.h
similarity index 100%
rename from src/applesofttoken.h
rename to src/applesoftfile/applesofttoken.h
diff --git a/src/catalogsector.cxx b/src/diskfiles/dos33/catalogsector.cxx
similarity index 100%
rename from src/catalogsector.cxx
rename to src/diskfiles/dos33/catalogsector.cxx
diff --git a/src/catalogsector.h b/src/diskfiles/dos33/catalogsector.h
similarity index 100%
rename from src/catalogsector.h
rename to src/diskfiles/dos33/catalogsector.h
diff --git a/src/diskfile.cxx b/src/diskfiles/dos33/diskfile.cxx
similarity index 100%
rename from src/diskfile.cxx
rename to src/diskfiles/dos33/diskfile.cxx
diff --git a/src/diskfile.h b/src/diskfiles/dos33/diskfile.h
similarity index 100%
rename from src/diskfile.h
rename to src/diskfiles/dos33/diskfile.h
diff --git a/src/filedescriptiveentry.cxx b/src/diskfiles/dos33/filedescriptiveentry.cxx
similarity index 100%
rename from src/filedescriptiveentry.cxx
rename to src/diskfiles/dos33/filedescriptiveentry.cxx
diff --git a/src/filedescriptiveentry.h b/src/diskfiles/dos33/filedescriptiveentry.h
similarity index 100%
rename from src/filedescriptiveentry.h
rename to src/diskfiles/dos33/filedescriptiveentry.h
diff --git a/src/sector.cxx b/src/diskfiles/dos33/sector.cxx
similarity index 100%
rename from src/sector.cxx
rename to src/diskfiles/dos33/sector.cxx
diff --git a/src/sector.h b/src/diskfiles/dos33/sector.h
similarity index 100%
rename from src/sector.h
rename to src/diskfiles/dos33/sector.h
diff --git a/src/tracksectorlist.cxx b/src/diskfiles/dos33/tracksectorlist.cxx
similarity index 100%
rename from src/tracksectorlist.cxx
rename to src/diskfiles/dos33/tracksectorlist.cxx
diff --git a/src/tracksectorlist.h b/src/diskfiles/dos33/tracksectorlist.h
similarity index 100%
rename from src/tracksectorlist.h
rename to src/diskfiles/dos33/tracksectorlist.h
diff --git a/src/vtoc.cxx b/src/diskfiles/dos33/vtoc.cxx
similarity index 100%
rename from src/vtoc.cxx
rename to src/diskfiles/dos33/vtoc.cxx
diff --git a/src/vtoc.h b/src/diskfiles/dos33/vtoc.h
similarity index 100%
rename from src/vtoc.h
rename to src/diskfiles/dos33/vtoc.h
diff --git a/src/applesoftfileviewer.cxx b/src/viewers/applesoftfileviewer.cxx
similarity index 100%
rename from src/applesoftfileviewer.cxx
rename to src/viewers/applesoftfileviewer.cxx
diff --git a/src/applesoftfileviewer.h b/src/viewers/applesoftfileviewer.h
similarity index 100%
rename from src/applesoftfileviewer.h
rename to src/viewers/applesoftfileviewer.h
diff --git a/src/applesoftfileviewer.ui b/src/viewers/applesoftfileviewer.ui
similarity index 100%
rename from src/applesoftfileviewer.ui
rename to src/viewers/applesoftfileviewer.ui
diff --git a/src/hiresviewwidget.cxx b/src/viewers/hiresviewwidget.cxx
similarity index 100%
rename from src/hiresviewwidget.cxx
rename to src/viewers/hiresviewwidget.cxx
diff --git a/src/hiresviewwidget.h b/src/viewers/hiresviewwidget.h
similarity index 100%
rename from src/hiresviewwidget.h
rename to src/viewers/hiresviewwidget.h