diff --git a/include/final/emptyfstring.h b/src/include/final/emptyfstring.h
similarity index 100%
rename from include/final/emptyfstring.h
rename to src/include/final/emptyfstring.h
diff --git a/include/final/fapplication.h b/src/include/final/fapplication.h
similarity index 100%
rename from include/final/fapplication.h
rename to src/include/final/fapplication.h
diff --git a/include/final/fbutton.h b/src/include/final/fbutton.h
similarity index 100%
rename from include/final/fbutton.h
rename to src/include/final/fbutton.h
diff --git a/include/final/fbuttongroup.h b/src/include/final/fbuttongroup.h
similarity index 100%
rename from include/final/fbuttongroup.h
rename to src/include/final/fbuttongroup.h
diff --git a/include/final/fc.h b/src/include/final/fc.h
similarity index 100%
rename from include/final/fc.h
rename to src/include/final/fc.h
diff --git a/include/final/fcharmap.h b/src/include/final/fcharmap.h
similarity index 100%
rename from include/final/fcharmap.h
rename to src/include/final/fcharmap.h
diff --git a/include/final/fcheckbox.h b/src/include/final/fcheckbox.h
similarity index 100%
rename from include/final/fcheckbox.h
rename to src/include/final/fcheckbox.h
diff --git a/include/final/fcheckmenuitem.h b/src/include/final/fcheckmenuitem.h
similarity index 100%
rename from include/final/fcheckmenuitem.h
rename to src/include/final/fcheckmenuitem.h
diff --git a/include/final/fcolorpalette.h b/src/include/final/fcolorpalette.h
similarity index 100%
rename from include/final/fcolorpalette.h
rename to src/include/final/fcolorpalette.h
diff --git a/include/final/fconfig.h b/src/include/final/fconfig.h
similarity index 100%
rename from include/final/fconfig.h
rename to src/include/final/fconfig.h
diff --git a/include/final/fdialog.h b/src/include/final/fdialog.h
similarity index 100%
rename from include/final/fdialog.h
rename to src/include/final/fdialog.h
diff --git a/include/final/fdialoglistmenu.h b/src/include/final/fdialoglistmenu.h
similarity index 100%
rename from include/final/fdialoglistmenu.h
rename to src/include/final/fdialoglistmenu.h
diff --git a/include/final/fevent.h b/src/include/final/fevent.h
similarity index 100%
rename from include/final/fevent.h
rename to src/include/final/fevent.h
diff --git a/include/final/ffiledialog.h b/src/include/final/ffiledialog.h
similarity index 100%
rename from include/final/ffiledialog.h
rename to src/include/final/ffiledialog.h
diff --git a/include/final/final.h b/src/include/final/final.h
similarity index 100%
rename from include/final/final.h
rename to src/include/final/final.h
diff --git a/include/final/fkey_map.h b/src/include/final/fkey_map.h
similarity index 100%
rename from include/final/fkey_map.h
rename to src/include/final/fkey_map.h
diff --git a/include/final/fkeyboard.h b/src/include/final/fkeyboard.h
similarity index 100%
rename from include/final/fkeyboard.h
rename to src/include/final/fkeyboard.h
diff --git a/include/final/flabel.h b/src/include/final/flabel.h
similarity index 100%
rename from include/final/flabel.h
rename to src/include/final/flabel.h
diff --git a/include/final/flineedit.h b/src/include/final/flineedit.h
similarity index 100%
rename from include/final/flineedit.h
rename to src/include/final/flineedit.h
diff --git a/include/final/flistbox.h b/src/include/final/flistbox.h
similarity index 100%
rename from include/final/flistbox.h
rename to src/include/final/flistbox.h
diff --git a/include/final/flistview.h b/src/include/final/flistview.h
similarity index 100%
rename from include/final/flistview.h
rename to src/include/final/flistview.h
diff --git a/include/final/fmenu.h b/src/include/final/fmenu.h
similarity index 100%
rename from include/final/fmenu.h
rename to src/include/final/fmenu.h
diff --git a/include/final/fmenubar.h b/src/include/final/fmenubar.h
similarity index 100%
rename from include/final/fmenubar.h
rename to src/include/final/fmenubar.h
diff --git a/include/final/fmenuitem.h b/src/include/final/fmenuitem.h
similarity index 100%
rename from include/final/fmenuitem.h
rename to src/include/final/fmenuitem.h
diff --git a/include/final/fmenulist.h b/src/include/final/fmenulist.h
similarity index 100%
rename from include/final/fmenulist.h
rename to src/include/final/fmenulist.h
diff --git a/include/final/fmessagebox.h b/src/include/final/fmessagebox.h
similarity index 100%
rename from include/final/fmessagebox.h
rename to src/include/final/fmessagebox.h
diff --git a/include/final/fmouse.h b/src/include/final/fmouse.h
similarity index 100%
rename from include/final/fmouse.h
rename to src/include/final/fmouse.h
diff --git a/include/final/fobject.h b/src/include/final/fobject.h
similarity index 100%
rename from include/final/fobject.h
rename to src/include/final/fobject.h
diff --git a/include/final/foptiattr.h b/src/include/final/foptiattr.h
similarity index 100%
rename from include/final/foptiattr.h
rename to src/include/final/foptiattr.h
diff --git a/include/final/foptimove.h b/src/include/final/foptimove.h
similarity index 100%
rename from include/final/foptimove.h
rename to src/include/final/foptimove.h
diff --git a/include/final/fpoint.h b/src/include/final/fpoint.h
similarity index 100%
rename from include/final/fpoint.h
rename to src/include/final/fpoint.h
diff --git a/include/final/fprogressbar.h b/src/include/final/fprogressbar.h
similarity index 100%
rename from include/final/fprogressbar.h
rename to src/include/final/fprogressbar.h
diff --git a/include/final/fradiobutton.h b/src/include/final/fradiobutton.h
similarity index 100%
rename from include/final/fradiobutton.h
rename to src/include/final/fradiobutton.h
diff --git a/include/final/fradiomenuitem.h b/src/include/final/fradiomenuitem.h
similarity index 100%
rename from include/final/fradiomenuitem.h
rename to src/include/final/fradiomenuitem.h
diff --git a/include/final/frect.h b/src/include/final/frect.h
similarity index 100%
rename from include/final/frect.h
rename to src/include/final/frect.h
diff --git a/include/final/fscrollbar.h b/src/include/final/fscrollbar.h
similarity index 100%
rename from include/final/fscrollbar.h
rename to src/include/final/fscrollbar.h
diff --git a/include/final/fscrollview.h b/src/include/final/fscrollview.h
similarity index 100%
rename from include/final/fscrollview.h
rename to src/include/final/fscrollview.h
diff --git a/include/final/fstatusbar.h b/src/include/final/fstatusbar.h
similarity index 100%
rename from include/final/fstatusbar.h
rename to src/include/final/fstatusbar.h
diff --git a/include/final/fstring.h b/src/include/final/fstring.h
similarity index 100%
rename from include/final/fstring.h
rename to src/include/final/fstring.h
diff --git a/include/final/fswitch.h b/src/include/final/fswitch.h
similarity index 100%
rename from include/final/fswitch.h
rename to src/include/final/fswitch.h
diff --git a/include/final/ftcap_map.h b/src/include/final/ftcap_map.h
similarity index 100%
rename from include/final/ftcap_map.h
rename to src/include/final/ftcap_map.h
diff --git a/include/final/fterm.h b/src/include/final/fterm.h
similarity index 100%
rename from include/final/fterm.h
rename to src/include/final/fterm.h
diff --git a/include/final/ftermbuffer.h b/src/include/final/ftermbuffer.h
similarity index 100%
rename from include/final/ftermbuffer.h
rename to src/include/final/ftermbuffer.h
diff --git a/include/final/ftermcap.h b/src/include/final/ftermcap.h
similarity index 100%
rename from include/final/ftermcap.h
rename to src/include/final/ftermcap.h
diff --git a/include/final/ftermcapquirks.h b/src/include/final/ftermcapquirks.h
similarity index 100%
rename from include/final/ftermcapquirks.h
rename to src/include/final/ftermcapquirks.h
diff --git a/include/final/ftermdetection.h b/src/include/final/ftermdetection.h
similarity index 100%
rename from include/final/ftermdetection.h
rename to src/include/final/ftermdetection.h
diff --git a/include/final/ftermfreebsd.h b/src/include/final/ftermfreebsd.h
similarity index 100%
rename from include/final/ftermfreebsd.h
rename to src/include/final/ftermfreebsd.h
diff --git a/include/final/ftermios.h b/src/include/final/ftermios.h
similarity index 100%
rename from include/final/ftermios.h
rename to src/include/final/ftermios.h
diff --git a/include/final/ftermlinux.h b/src/include/final/ftermlinux.h
similarity index 100%
rename from include/final/ftermlinux.h
rename to src/include/final/ftermlinux.h
diff --git a/include/final/ftermopenbsd.h b/src/include/final/ftermopenbsd.h
similarity index 100%
rename from include/final/ftermopenbsd.h
rename to src/include/final/ftermopenbsd.h
diff --git a/include/final/ftermxterminal.h b/src/include/final/ftermxterminal.h
similarity index 100%
rename from include/final/ftermxterminal.h
rename to src/include/final/ftermxterminal.h
diff --git a/include/final/ftextview.h b/src/include/final/ftextview.h
similarity index 100%
rename from include/final/ftextview.h
rename to src/include/final/ftextview.h
diff --git a/include/final/ftogglebutton.h b/src/include/final/ftogglebutton.h
similarity index 100%
rename from include/final/ftogglebutton.h
rename to src/include/final/ftogglebutton.h
diff --git a/include/final/ftooltip.h b/src/include/final/ftooltip.h
similarity index 100%
rename from include/final/ftooltip.h
rename to src/include/final/ftooltip.h
diff --git a/include/final/ftypes.h b/src/include/final/ftypes.h
similarity index 100%
rename from include/final/ftypes.h
rename to src/include/final/ftypes.h
diff --git a/include/final/fvterm.h b/src/include/final/fvterm.h
similarity index 100%
rename from include/final/fvterm.h
rename to src/include/final/fvterm.h
diff --git a/include/final/fwidget.h b/src/include/final/fwidget.h
similarity index 100%
rename from include/final/fwidget.h
rename to src/include/final/fwidget.h
diff --git a/include/final/fwidgetcolors.h b/src/include/final/fwidgetcolors.h
similarity index 100%
rename from include/final/fwidgetcolors.h
rename to src/include/final/fwidgetcolors.h
diff --git a/include/final/fwindow.h b/src/include/final/fwindow.h
similarity index 100%
rename from include/final/fwindow.h
rename to src/include/final/fwindow.h