diff --git a/sqlitebrowser/.gitignore b/.gitignore
similarity index 64%
rename from sqlitebrowser/.gitignore
rename to .gitignore
index 5a2ef2b0..e8615f79 100644
--- a/sqlitebrowser/.gitignore
+++ b/.gitignore
@@ -3,4 +3,4 @@ Makefile
 .moc/
 .obj/
 sqlitedbbrowser.pro.user
-sqlitebrowser/qrc_icons.cpp
+src/qrc_icons.cpp
diff --git a/sqlitebrowser/sqlitedbbrowser.pro b/sqlitedbbrowser.pro
similarity index 64%
rename from sqlitebrowser/sqlitedbbrowser.pro
rename to sqlitedbbrowser.pro
index 400b6dbe..3d8a3717 100755
--- a/sqlitebrowser/sqlitedbbrowser.pro
+++ b/sqlitedbbrowser.pro
@@ -2,7 +2,7 @@ QT += qt3support
 
 TEMPLATE    =	subdirs
 
-SUBDIRS	=	sqlitebrowser
+SUBDIRS	=	src
 
 
 
diff --git a/sqlitebrowser/sqlitebrowser/LICENSING.txt b/src/LICENSING.txt
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/LICENSING.txt
rename to src/LICENSING.txt
diff --git a/sqlitebrowser/sqlitebrowser/Qt_LGPL_EXCEPTION.txt b/src/Qt_LGPL_EXCEPTION.txt
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/Qt_LGPL_EXCEPTION.txt
rename to src/Qt_LGPL_EXCEPTION.txt
diff --git a/sqlitebrowser/sqlitebrowser/Qt_LICENSE_LGPL.txt b/src/Qt_LICENSE_LGPL.txt
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/Qt_LICENSE_LGPL.txt
rename to src/Qt_LICENSE_LGPL.txt
diff --git a/sqlitebrowser/sqlitebrowser/aboutform.cpp b/src/aboutform.cpp
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/aboutform.cpp
rename to src/aboutform.cpp
diff --git a/sqlitebrowser/sqlitebrowser/aboutform.h b/src/aboutform.h
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/aboutform.h
rename to src/aboutform.h
diff --git a/sqlitebrowser/sqlitebrowser/addfieldform.cpp b/src/addfieldform.cpp
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/addfieldform.cpp
rename to src/addfieldform.cpp
diff --git a/sqlitebrowser/sqlitebrowser/addfieldform.h b/src/addfieldform.h
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/addfieldform.h
rename to src/addfieldform.h
diff --git a/sqlitebrowser/sqlitebrowser/addfieldtypeform.cpp b/src/addfieldtypeform.cpp
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/addfieldtypeform.cpp
rename to src/addfieldtypeform.cpp
diff --git a/sqlitebrowser/sqlitebrowser/addfieldtypeform.h b/src/addfieldtypeform.h
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/addfieldtypeform.h
rename to src/addfieldtypeform.h
diff --git a/sqlitebrowser/sqlitebrowser/app.plist b/src/app.plist
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/app.plist
rename to src/app.plist
diff --git a/sqlitebrowser/sqlitebrowser/browsermain.cpp b/src/browsermain.cpp
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/browsermain.cpp
rename to src/browsermain.cpp
diff --git a/sqlitebrowser/sqlitebrowser/building b/src/building
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/building
rename to src/building
diff --git a/sqlitebrowser/sqlitebrowser/choosetableform.cpp b/src/choosetableform.cpp
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/choosetableform.cpp
rename to src/choosetableform.cpp
diff --git a/sqlitebrowser/sqlitebrowser/choosetableform.h b/src/choosetableform.h
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/choosetableform.h
rename to src/choosetableform.h
diff --git a/sqlitebrowser/sqlitebrowser/createindexform.cpp b/src/createindexform.cpp
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/createindexform.cpp
rename to src/createindexform.cpp
diff --git a/sqlitebrowser/sqlitebrowser/createindexform.h b/src/createindexform.h
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/createindexform.h
rename to src/createindexform.h
diff --git a/sqlitebrowser/sqlitebrowser/createtableform.cpp b/src/createtableform.cpp
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/createtableform.cpp
rename to src/createtableform.cpp
diff --git a/sqlitebrowser/sqlitebrowser/createtableform.h b/src/createtableform.h
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/createtableform.h
rename to src/createtableform.h
diff --git a/sqlitebrowser/sqlitebrowser/deleteindexform.cpp b/src/deleteindexform.cpp
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/deleteindexform.cpp
rename to src/deleteindexform.cpp
diff --git a/sqlitebrowser/sqlitebrowser/deleteindexform.h b/src/deleteindexform.h
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/deleteindexform.h
rename to src/deleteindexform.h
diff --git a/sqlitebrowser/sqlitebrowser/deletetableform.cpp b/src/deletetableform.cpp
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/deletetableform.cpp
rename to src/deletetableform.cpp
diff --git a/sqlitebrowser/sqlitebrowser/deletetableform.h b/src/deletetableform.h
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/deletetableform.h
rename to src/deletetableform.h
diff --git a/sqlitebrowser/sqlitebrowser/editfieldform.cpp b/src/editfieldform.cpp
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/editfieldform.cpp
rename to src/editfieldform.cpp
diff --git a/sqlitebrowser/sqlitebrowser/editfieldform.h b/src/editfieldform.h
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/editfieldform.h
rename to src/editfieldform.h
diff --git a/sqlitebrowser/sqlitebrowser/editform.cpp b/src/editform.cpp
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/editform.cpp
rename to src/editform.cpp
diff --git a/sqlitebrowser/sqlitebrowser/editform.h b/src/editform.h
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/editform.h
rename to src/editform.h
diff --git a/sqlitebrowser/sqlitebrowser/edittableform.cpp b/src/edittableform.cpp
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/edittableform.cpp
rename to src/edittableform.cpp
diff --git a/sqlitebrowser/sqlitebrowser/edittableform.h b/src/edittableform.h
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/edittableform.h
rename to src/edittableform.h
diff --git a/sqlitebrowser/sqlitebrowser/exporttablecsvform.cpp b/src/exporttablecsvform.cpp
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/exporttablecsvform.cpp
rename to src/exporttablecsvform.cpp
diff --git a/sqlitebrowser/sqlitebrowser/exporttablecsvform.h b/src/exporttablecsvform.h
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/exporttablecsvform.h
rename to src/exporttablecsvform.h
diff --git a/sqlitebrowser/sqlitebrowser/extendedmainform.cpp b/src/extendedmainform.cpp
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/extendedmainform.cpp
rename to src/extendedmainform.cpp
diff --git a/sqlitebrowser/sqlitebrowser/extendedmainform.h b/src/extendedmainform.h
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/extendedmainform.h
rename to src/extendedmainform.h
diff --git a/sqlitebrowser/sqlitebrowser/findform.cpp b/src/findform.cpp
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/findform.cpp
rename to src/findform.cpp
diff --git a/sqlitebrowser/sqlitebrowser/findform.h b/src/findform.h
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/findform.h
rename to src/findform.h
diff --git a/sqlitebrowser/sqlitebrowser/form1.cpp b/src/form1.cpp
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/form1.cpp
rename to src/form1.cpp
diff --git a/sqlitebrowser/sqlitebrowser/form1.h b/src/form1.h
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/form1.h
rename to src/form1.h
diff --git a/sqlitebrowser/sqlitebrowser/icons/accept.png b/src/icons/accept.png
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/icons/accept.png
rename to src/icons/accept.png
diff --git a/sqlitebrowser/sqlitebrowser/icons/add.png b/src/icons/add.png
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/icons/add.png
rename to src/icons/add.png
diff --git a/sqlitebrowser/sqlitebrowser/icons/bullet_black.png b/src/icons/bullet_black.png
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/icons/bullet_black.png
rename to src/icons/bullet_black.png
diff --git a/sqlitebrowser/sqlitebrowser/icons/cancel.png b/src/icons/cancel.png
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/icons/cancel.png
rename to src/icons/cancel.png
diff --git a/sqlitebrowser/sqlitebrowser/icons/database_add.png b/src/icons/database_add.png
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/icons/database_add.png
rename to src/icons/database_add.png
diff --git a/sqlitebrowser/sqlitebrowser/icons/database_go.png b/src/icons/database_go.png
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/icons/database_go.png
rename to src/icons/database_go.png
diff --git a/sqlitebrowser/sqlitebrowser/icons/database_refresh.png b/src/icons/database_refresh.png
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/icons/database_refresh.png
rename to src/icons/database_refresh.png
diff --git a/sqlitebrowser/sqlitebrowser/icons/database_save.png b/src/icons/database_save.png
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/icons/database_save.png
rename to src/icons/database_save.png
diff --git a/sqlitebrowser/sqlitebrowser/icons/icons.qrc b/src/icons/icons.qrc
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/icons/icons.qrc
rename to src/icons/icons.qrc
diff --git a/sqlitebrowser/sqlitebrowser/icons/page_add.png b/src/icons/page_add.png
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/icons/page_add.png
rename to src/icons/page_add.png
diff --git a/sqlitebrowser/sqlitebrowser/icons/page_delete.png b/src/icons/page_delete.png
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/icons/page_delete.png
rename to src/icons/page_delete.png
diff --git a/sqlitebrowser/sqlitebrowser/icons/page_edit.png b/src/icons/page_edit.png
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/icons/page_edit.png
rename to src/icons/page_edit.png
diff --git a/sqlitebrowser/sqlitebrowser/icons/page_green.png b/src/icons/page_green.png
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/icons/page_green.png
rename to src/icons/page_green.png
diff --git a/sqlitebrowser/sqlitebrowser/icons/table.png b/src/icons/table.png
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/icons/table.png
rename to src/icons/table.png
diff --git a/sqlitebrowser/sqlitebrowser/icons/table_add.png b/src/icons/table_add.png
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/icons/table_add.png
rename to src/icons/table_add.png
diff --git a/sqlitebrowser/sqlitebrowser/icons/table_delete.png b/src/icons/table_delete.png
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/icons/table_delete.png
rename to src/icons/table_delete.png
diff --git a/sqlitebrowser/sqlitebrowser/icons/table_edit.png b/src/icons/table_edit.png
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/icons/table_edit.png
rename to src/icons/table_edit.png
diff --git a/sqlitebrowser/sqlitebrowser/icons/tag_blue.png b/src/icons/tag_blue.png
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/icons/tag_blue.png
rename to src/icons/tag_blue.png
diff --git a/sqlitebrowser/sqlitebrowser/icons/tag_blue_add.png b/src/icons/tag_blue_add.png
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/icons/tag_blue_add.png
rename to src/icons/tag_blue_add.png
diff --git a/sqlitebrowser/sqlitebrowser/icons/tag_blue_delete.png b/src/icons/tag_blue_delete.png
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/icons/tag_blue_delete.png
rename to src/icons/tag_blue_delete.png
diff --git a/sqlitebrowser/sqlitebrowser/iconwin.ico b/src/iconwin.ico
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/iconwin.ico
rename to src/iconwin.ico
diff --git a/sqlitebrowser/sqlitebrowser/images/128.png b/src/images/128.png
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/images/128.png
rename to src/images/128.png
diff --git a/sqlitebrowser/sqlitebrowser/images/create_index.png b/src/images/create_index.png
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/images/create_index.png
rename to src/images/create_index.png
diff --git a/sqlitebrowser/sqlitebrowser/images/create_table.png b/src/images/create_table.png
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/images/create_table.png
rename to src/images/create_table.png
diff --git a/sqlitebrowser/sqlitebrowser/images/delete_index.png b/src/images/delete_index.png
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/images/delete_index.png
rename to src/images/delete_index.png
diff --git a/sqlitebrowser/sqlitebrowser/images/delete_table.png b/src/images/delete_table.png
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/images/delete_table.png
rename to src/images/delete_table.png
diff --git a/sqlitebrowser/sqlitebrowser/images/icone16.png b/src/images/icone16.png
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/images/icone16.png
rename to src/images/icone16.png
diff --git a/sqlitebrowser/sqlitebrowser/images/log.png b/src/images/log.png
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/images/log.png
rename to src/images/log.png
diff --git a/sqlitebrowser/sqlitebrowser/images/modify_table.png b/src/images/modify_table.png
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/images/modify_table.png
rename to src/images/modify_table.png
diff --git a/sqlitebrowser/sqlitebrowser/images/new.png b/src/images/new.png
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/images/new.png
rename to src/images/new.png
diff --git a/sqlitebrowser/sqlitebrowser/images/open.png b/src/images/open.png
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/images/open.png
rename to src/images/open.png
diff --git a/sqlitebrowser/sqlitebrowser/images/revert.png b/src/images/revert.png
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/images/revert.png
rename to src/images/revert.png
diff --git a/sqlitebrowser/sqlitebrowser/images/save.png b/src/images/save.png
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/images/save.png
rename to src/images/save.png
diff --git a/sqlitebrowser/sqlitebrowser/images/searchfind.png b/src/images/searchfind.png
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/images/searchfind.png
rename to src/images/searchfind.png
diff --git a/sqlitebrowser/sqlitebrowser/images/whatis.png b/src/images/whatis.png
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/images/whatis.png
rename to src/images/whatis.png
diff --git a/sqlitebrowser/sqlitebrowser/importcsvform.cpp b/src/importcsvform.cpp
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/importcsvform.cpp
rename to src/importcsvform.cpp
diff --git a/sqlitebrowser/sqlitebrowser/importcsvform.h b/src/importcsvform.h
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/importcsvform.h
rename to src/importcsvform.h
diff --git a/sqlitebrowser/sqlitebrowser/macapp.icns b/src/macapp.icns
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/macapp.icns
rename to src/macapp.icns
diff --git a/sqlitebrowser/sqlitebrowser/preferencesform.cpp b/src/preferencesform.cpp
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/preferencesform.cpp
rename to src/preferencesform.cpp
diff --git a/sqlitebrowser/sqlitebrowser/preferencesform.h b/src/preferencesform.h
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/preferencesform.h
rename to src/preferencesform.h
diff --git a/sqlitebrowser/sqlitebrowser/renametableform.cpp b/src/renametableform.cpp
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/renametableform.cpp
rename to src/renametableform.cpp
diff --git a/sqlitebrowser/sqlitebrowser/renametableform.h b/src/renametableform.h
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/renametableform.h
rename to src/renametableform.h
diff --git a/sqlitebrowser/sqlitebrowser/sqlbrowser_util.c b/src/sqlbrowser_util.c
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/sqlbrowser_util.c
rename to src/sqlbrowser_util.c
diff --git a/sqlitebrowser/sqlitebrowser/sqlbrowser_util.h b/src/sqlbrowser_util.h
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/sqlbrowser_util.h
rename to src/sqlbrowser_util.h
diff --git a/sqlitebrowser/sqlitebrowser/sqlite_source/sqlite3.c b/src/sqlite_source/sqlite3.c
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/sqlite_source/sqlite3.c
rename to src/sqlite_source/sqlite3.c
diff --git a/sqlitebrowser/sqlitebrowser/sqlite_source/sqlite3.h b/src/sqlite_source/sqlite3.h
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/sqlite_source/sqlite3.h
rename to src/sqlite_source/sqlite3.h
diff --git a/sqlitebrowser/sqlitebrowser/sqlite_source/sqlite3ext.h b/src/sqlite_source/sqlite3ext.h
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/sqlite_source/sqlite3ext.h
rename to src/sqlite_source/sqlite3ext.h
diff --git a/sqlitebrowser/sqlitebrowser/sqlitebrowser.pro b/src/sqlitebrowser.pro
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/sqlitebrowser.pro
rename to src/sqlitebrowser.pro
diff --git a/sqlitebrowser/sqlitebrowser/sqlitebrowsertypes.h b/src/sqlitebrowsertypes.h
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/sqlitebrowsertypes.h
rename to src/sqlitebrowsertypes.h
diff --git a/sqlitebrowser/sqlitebrowser/sqlitedb.cpp b/src/sqlitedb.cpp
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/sqlitedb.cpp
rename to src/sqlitedb.cpp
diff --git a/sqlitebrowser/sqlitebrowser/sqlitedb.h b/src/sqlitedb.h
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/sqlitedb.h
rename to src/sqlitedb.h
diff --git a/sqlitebrowser/sqlitebrowser/sqllogform.cpp b/src/sqllogform.cpp
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/sqllogform.cpp
rename to src/sqllogform.cpp
diff --git a/sqlitebrowser/sqlitebrowser/sqllogform.h b/src/sqllogform.h
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/sqllogform.h
rename to src/sqllogform.h
diff --git a/sqlitebrowser/sqlitebrowser/winapp.rc b/src/winapp.rc
similarity index 100%
rename from sqlitebrowser/sqlitebrowser/winapp.rc
rename to src/winapp.rc