diff --git a/configure.in b/configure.in
index d2344b8d6..a6900a7b8 100644
--- a/configure.in
+++ b/configure.in
@@ -152,15 +152,15 @@ src/plugins/webreport/Makefile
 src/plugins/webstuff/Makefile
 src/plugins/webstuff/css/Makefile
 src/plugins/webstuff/images/Makefile
-src/plugins/webstuff/js/Makefile
+src/plugins/webstuff/javascript/Makefile
 src/DateHandler/Makefile
 src/data/Makefile
 src/glade/Makefile
 src/images/Makefile
-src/images/scalable/Makefile
 src/images/16x16/Makefile
 src/images/22x22/Makefile
 src/images/48x48/Makefile
+src/images/scalable/Makefile
 data/Makefile
 data/man/Makefile
 data/man/cs/Makefile
diff --git a/src/images/Makefile.am b/src/images/Makefile.am
index 3731ab477..86913d60f 100644
--- a/src/images/Makefile.am
+++ b/src/images/Makefile.am
@@ -9,7 +9,6 @@ icondir= $(datadir)/pixmaps
 
 dist_pkgdata_DATA = \
         gramps.png\
-	gramps.svg\
 	gramps-export.png\
 	gramps-import.png\
         gramps-undo-history.png\
@@ -18,8 +17,6 @@ dist_pkgdata_DATA = \
         logo.png\
         ped24.ico\
         splash.jpg\
-	stock_link.png\
-	stock_new_html.png\
-	stock_notes.png
+	stock_link.png
 
 EXTRA_DIST = gramps.svg 
diff --git a/src/plugins/lib/maps/Makefile.am b/src/plugins/lib/maps/Makefile.am
index 4550c2c2c..873e75bcd 100644
--- a/src/plugins/lib/maps/Makefile.am
+++ b/src/plugins/lib/maps/Makefile.am
@@ -3,9 +3,15 @@ pkgdatadir = $(datadir)/@PACKAGE@/plugins/lib/maps
 
 pkgpython_PYTHON = \
 	constants.py\
+	dummylayer.py\
+	dummynogps.py\
 	geography.py\
-	grampsmaps.py\
-	__init__.py
+	__init__.py\
+	lifewaylayer.py\
+	osmGps.py\
+	placeselection.py\
+	selectionlayer.py
+
 
 pkgpyexecdir = @pkgpyexecdir@/plugins/lib/maps
 pkgpythondir = $(datadir)/@PACKAGE@/plugins/lib/maps
diff --git a/src/plugins/view/Makefile.am b/src/plugins/view/Makefile.am
index 54d9a4607..09758a10f 100644
--- a/src/plugins/view/Makefile.am
+++ b/src/plugins/view/Makefile.am
@@ -13,6 +13,7 @@ pkgpython_PYTHON = \
 	familyview.py \
 	fanchartview.gpr.py \
 	fanchartview.py \
+	geoclose.py \
 	geoevents.py \
 	geoplaces.py \
 	geoperson.py \
diff --git a/src/plugins/webstuff/Makefile.am b/src/plugins/webstuff/Makefile.am
index 28aec9ad1..d48855c2a 100644
--- a/src/plugins/webstuff/Makefile.am
+++ b/src/plugins/webstuff/Makefile.am
@@ -5,7 +5,7 @@
 
 # $Id$
 
-SUBDIRS = css images js
+SUBDIRS = css images javascript
 
 pkgdatadir = $(datadir)/@PACKAGE@/plugins/webstuff
 
diff --git a/src/plugins/webstuff/js/Makefile.am b/src/plugins/webstuff/javascript/Makefile.am
similarity index 100%
rename from src/plugins/webstuff/js/Makefile.am
rename to src/plugins/webstuff/javascript/Makefile.am
diff --git a/src/plugins/webstuff/js/jquery-1.3.2.min.js b/src/plugins/webstuff/javascript/jquery-1.3.2.min.js
similarity index 100%
rename from src/plugins/webstuff/js/jquery-1.3.2.min.js
rename to src/plugins/webstuff/javascript/jquery-1.3.2.min.js
diff --git a/src/plugins/webstuff/js/jquery-1.7.1.js b/src/plugins/webstuff/javascript/jquery-1.7.1.js
similarity index 100%
rename from src/plugins/webstuff/js/jquery-1.7.1.js
rename to src/plugins/webstuff/javascript/jquery-1.7.1.js
diff --git a/src/plugins/webstuff/js/jquery-1.7.1.min.js b/src/plugins/webstuff/javascript/jquery-1.7.1.min.js
similarity index 100%
rename from src/plugins/webstuff/js/jquery-1.7.1.min.js
rename to src/plugins/webstuff/javascript/jquery-1.7.1.min.js
diff --git a/src/plugins/webstuff/js/jquery-ui-1.7.2.custom.min.js b/src/plugins/webstuff/javascript/jquery-ui-1.7.2.custom.min.js
similarity index 100%
rename from src/plugins/webstuff/js/jquery-ui-1.7.2.custom.min.js
rename to src/plugins/webstuff/javascript/jquery-ui-1.7.2.custom.min.js