diff --git a/3.0/modules/photoannotation/controllers/admin_photoannotation.php b/3.0/modules/photo_annotation/controllers/admin_photoannotation.php
old mode 100755
new mode 100644
similarity index 100%
rename from 3.0/modules/photoannotation/controllers/admin_photoannotation.php
rename to 3.0/modules/photo_annotation/controllers/admin_photoannotation.php
diff --git a/3.0/modules/photoannotation/controllers/photoannotation.php b/3.0/modules/photo_annotation/controllers/photoannotation.php
similarity index 100%
rename from 3.0/modules/photoannotation/controllers/photoannotation.php
rename to 3.0/modules/photo_annotation/controllers/photoannotation.php
diff --git a/3.0/modules/photoannotation/css/colorpicker.css b/3.0/modules/photo_annotation/css/colorpicker.css
similarity index 94%
rename from 3.0/modules/photoannotation/css/colorpicker.css
rename to 3.0/modules/photo_annotation/css/colorpicker.css
index 05b02b48..0b3d5d93 100644
--- a/3.0/modules/photoannotation/css/colorpicker.css
+++ b/3.0/modules/photo_annotation/css/colorpicker.css
@@ -1,161 +1,161 @@
-.colorpicker {
-	width: 356px;
-	height: 176px;
-	overflow: hidden;
-	position: absolute;
-	background: url(../images/colorpicker_background.png);
-	font-family: Arial, Helvetica, sans-serif;
-	display: none;
-}
-.colorpicker_color {
-	width: 150px;
-	height: 150px;
-	left: 14px;
-	top: 13px;
-	position: absolute;
-	background: #f00;
-	overflow: hidden;
-	cursor: crosshair;
-}
-.colorpicker_color div {
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 150px;
-	height: 150px;
-	background: url(../images/colorpicker_overlay.png);
-}
-.colorpicker_color div div {
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 11px;
-	height: 11px;
-	overflow: hidden;
-	background: url(../images/colorpicker_select.gif);
-	margin: -5px 0 0 -5px;
-}
-.colorpicker_hue {
-	position: absolute;
-	top: 13px;
-	left: 171px;
-	width: 35px;
-	height: 150px;
-	cursor: n-resize;
-}
-.colorpicker_hue div {
-	position: absolute;
-	width: 35px;
-	height: 9px;
-	overflow: hidden;
-	background: url(../images/colorpicker_indic.gif) left top;
-	margin: -4px 0 0 0;
-	left: 0px;
-}
-.colorpicker_new_color {
-	position: absolute;
-	width: 60px;
-	height: 30px;
-	left: 213px;
-	top: 13px;
-	background: #f00;
-}
-.colorpicker_current_color {
-	position: absolute;
-	width: 60px;
-	height: 30px;
-	left: 283px;
-	top: 13px;
-	background: #f00;
-}
-.colorpicker input {
-	background-color: transparent;
-	border: 1px solid transparent;
-	position: absolute;
-	font-size: 10px;
-	font-family: Arial, Helvetica, sans-serif;
-	color: #898989;
-	top: 4px;
-	right: 11px;
-	text-align: right;
-	margin: 0;
-	padding: 0;
-	height: 11px;
-}
-.colorpicker_hex {
-	position: absolute;
-	width: 72px;
-	height: 22px;
-	background: url(../images/colorpicker_hex.png) top;
-	left: 212px;
-	top: 142px;
-}
-.colorpicker_hex input {
-	right: 6px;
-}
-.colorpicker_field {
-	height: 22px;
-	width: 62px;
-	background-position: top;
-	position: absolute;
-}
-.colorpicker_field span {
-	position: absolute;
-	width: 12px;
-	height: 22px;
-	overflow: hidden;
-	top: 0;
-	right: 0;
-	cursor: n-resize;
-}
-.colorpicker_rgb_r {
-	background-image: url(../images/colorpicker_rgb_r.png);
-	top: 52px;
-	left: 212px;
-}
-.colorpicker_rgb_g {
-	background-image: url(../images/colorpicker_rgb_g.png);
-	top: 82px;
-	left: 212px;
-}
-.colorpicker_rgb_b {
-	background-image: url(../images/colorpicker_rgb_b.png);
-	top: 112px;
-	left: 212px;
-}
-.colorpicker_hsb_h {
-	background-image: url(../images/colorpicker_hsb_h.png);
-	top: 52px;
-	left: 282px;
-}
-.colorpicker_hsb_s {
-	background-image: url(../images/colorpicker_hsb_s.png);
-	top: 82px;
-	left: 282px;
-}
-.colorpicker_hsb_b {
-	background-image: url(../images/colorpicker_hsb_b.png);
-	top: 112px;
-	left: 282px;
-}
-.colorpicker_submit {
-	position: absolute;
-	width: 22px;
-	height: 22px;
-	background: url(../images/colorpicker_submit.png) top;
-	left: 322px;
-	top: 142px;
-	overflow: hidden;
-}
-.colorpicker_focus {
-	background-position: center;
-}
-.colorpicker_hex.colorpicker_focus {
-	background-position: bottom;
-}
-.colorpicker_submit.colorpicker_focus {
-	background-position: bottom;
-}
-.colorpicker_slider {
-	background-position: bottom;
-}
+.colorpicker {
+	width: 356px;
+	height: 176px;
+	overflow: hidden;
+	position: absolute;
+	background: url(../images/colorpicker_background.png);
+	font-family: Arial, Helvetica, sans-serif;
+	display: none;
+}
+.colorpicker_color {
+	width: 150px;
+	height: 150px;
+	left: 14px;
+	top: 13px;
+	position: absolute;
+	background: #f00;
+	overflow: hidden;
+	cursor: crosshair;
+}
+.colorpicker_color div {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 150px;
+	height: 150px;
+	background: url(../images/colorpicker_overlay.png);
+}
+.colorpicker_color div div {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 11px;
+	height: 11px;
+	overflow: hidden;
+	background: url(../images/colorpicker_select.gif);
+	margin: -5px 0 0 -5px;
+}
+.colorpicker_hue {
+	position: absolute;
+	top: 13px;
+	left: 171px;
+	width: 35px;
+	height: 150px;
+	cursor: n-resize;
+}
+.colorpicker_hue div {
+	position: absolute;
+	width: 35px;
+	height: 9px;
+	overflow: hidden;
+	background: url(../images/colorpicker_indic.gif) left top;
+	margin: -4px 0 0 0;
+	left: 0px;
+}
+.colorpicker_new_color {
+	position: absolute;
+	width: 60px;
+	height: 30px;
+	left: 213px;
+	top: 13px;
+	background: #f00;
+}
+.colorpicker_current_color {
+	position: absolute;
+	width: 60px;
+	height: 30px;
+	left: 283px;
+	top: 13px;
+	background: #f00;
+}
+.colorpicker input {
+	background-color: transparent;
+	border: 1px solid transparent;
+	position: absolute;
+	font-size: 10px;
+	font-family: Arial, Helvetica, sans-serif;
+	color: #898989;
+	top: 4px;
+	right: 11px;
+	text-align: right;
+	margin: 0;
+	padding: 0;
+	height: 11px;
+}
+.colorpicker_hex {
+	position: absolute;
+	width: 72px;
+	height: 22px;
+	background: url(../images/colorpicker_hex.png) top;
+	left: 212px;
+	top: 142px;
+}
+.colorpicker_hex input {
+	right: 6px;
+}
+.colorpicker_field {
+	height: 22px;
+	width: 62px;
+	background-position: top;
+	position: absolute;
+}
+.colorpicker_field span {
+	position: absolute;
+	width: 12px;
+	height: 22px;
+	overflow: hidden;
+	top: 0;
+	right: 0;
+	cursor: n-resize;
+}
+.colorpicker_rgb_r {
+	background-image: url(../images/colorpicker_rgb_r.png);
+	top: 52px;
+	left: 212px;
+}
+.colorpicker_rgb_g {
+	background-image: url(../images/colorpicker_rgb_g.png);
+	top: 82px;
+	left: 212px;
+}
+.colorpicker_rgb_b {
+	background-image: url(../images/colorpicker_rgb_b.png);
+	top: 112px;
+	left: 212px;
+}
+.colorpicker_hsb_h {
+	background-image: url(../images/colorpicker_hsb_h.png);
+	top: 52px;
+	left: 282px;
+}
+.colorpicker_hsb_s {
+	background-image: url(../images/colorpicker_hsb_s.png);
+	top: 82px;
+	left: 282px;
+}
+.colorpicker_hsb_b {
+	background-image: url(../images/colorpicker_hsb_b.png);
+	top: 112px;
+	left: 282px;
+}
+.colorpicker_submit {
+	position: absolute;
+	width: 22px;
+	height: 22px;
+	background: url(../images/colorpicker_submit.png) top;
+	left: 322px;
+	top: 142px;
+	overflow: hidden;
+}
+.colorpicker_focus {
+	background-position: center;
+}
+.colorpicker_hex.colorpicker_focus {
+	background-position: bottom;
+}
+.colorpicker_submit.colorpicker_focus {
+	background-position: bottom;
+}
+.colorpicker_slider {
+	background-position: bottom;
+}
diff --git a/3.0/modules/photoannotation/css/photoannotation.css b/3.0/modules/photo_annotation/css/photoannotation.css
similarity index 100%
rename from 3.0/modules/photoannotation/css/photoannotation.css
rename to 3.0/modules/photo_annotation/css/photoannotation.css
diff --git a/3.0/modules/photoannotation/helpers/photoannotation.php b/3.0/modules/photo_annotation/helpers/photoannotation.php
similarity index 100%
rename from 3.0/modules/photoannotation/helpers/photoannotation.php
rename to 3.0/modules/photo_annotation/helpers/photoannotation.php
diff --git a/3.0/modules/photoannotation/helpers/photoannotation_block.php b/3.0/modules/photo_annotation/helpers/photoannotation_block.php
similarity index 100%
rename from 3.0/modules/photoannotation/helpers/photoannotation_block.php
rename to 3.0/modules/photo_annotation/helpers/photoannotation_block.php
diff --git a/3.0/modules/photoannotation/helpers/photoannotation_event.php b/3.0/modules/photo_annotation/helpers/photoannotation_event.php
similarity index 100%
rename from 3.0/modules/photoannotation/helpers/photoannotation_event.php
rename to 3.0/modules/photo_annotation/helpers/photoannotation_event.php
diff --git a/3.0/modules/photoannotation/helpers/photoannotation_installer.php b/3.0/modules/photo_annotation/helpers/photoannotation_installer.php
similarity index 100%
rename from 3.0/modules/photoannotation/helpers/photoannotation_installer.php
rename to 3.0/modules/photo_annotation/helpers/photoannotation_installer.php
diff --git a/3.0/modules/photoannotation/helpers/photoannotation_theme.php b/3.0/modules/photo_annotation/helpers/photoannotation_theme.php
similarity index 100%
rename from 3.0/modules/photoannotation/helpers/photoannotation_theme.php
rename to 3.0/modules/photo_annotation/helpers/photoannotation_theme.php
diff --git a/3.0/modules/photoannotation/images/blank.gif b/3.0/modules/photo_annotation/images/blank.gif
similarity index 100%
rename from 3.0/modules/photoannotation/images/blank.gif
rename to 3.0/modules/photo_annotation/images/blank.gif
diff --git a/3.0/modules/photoannotation/images/colorpicker_background.png b/3.0/modules/photo_annotation/images/colorpicker_background.png
similarity index 100%
rename from 3.0/modules/photoannotation/images/colorpicker_background.png
rename to 3.0/modules/photo_annotation/images/colorpicker_background.png
diff --git a/3.0/modules/photoannotation/images/colorpicker_hex.png b/3.0/modules/photo_annotation/images/colorpicker_hex.png
similarity index 100%
rename from 3.0/modules/photoannotation/images/colorpicker_hex.png
rename to 3.0/modules/photo_annotation/images/colorpicker_hex.png
diff --git a/3.0/modules/photoannotation/images/colorpicker_hsb_b.png b/3.0/modules/photo_annotation/images/colorpicker_hsb_b.png
similarity index 100%
rename from 3.0/modules/photoannotation/images/colorpicker_hsb_b.png
rename to 3.0/modules/photo_annotation/images/colorpicker_hsb_b.png
diff --git a/3.0/modules/photoannotation/images/colorpicker_hsb_h.png b/3.0/modules/photo_annotation/images/colorpicker_hsb_h.png
similarity index 100%
rename from 3.0/modules/photoannotation/images/colorpicker_hsb_h.png
rename to 3.0/modules/photo_annotation/images/colorpicker_hsb_h.png
diff --git a/3.0/modules/photoannotation/images/colorpicker_hsb_s.png b/3.0/modules/photo_annotation/images/colorpicker_hsb_s.png
similarity index 100%
rename from 3.0/modules/photoannotation/images/colorpicker_hsb_s.png
rename to 3.0/modules/photo_annotation/images/colorpicker_hsb_s.png
diff --git a/3.0/modules/photoannotation/images/colorpicker_indic.gif b/3.0/modules/photo_annotation/images/colorpicker_indic.gif
similarity index 100%
rename from 3.0/modules/photoannotation/images/colorpicker_indic.gif
rename to 3.0/modules/photo_annotation/images/colorpicker_indic.gif
diff --git a/3.0/modules/photoannotation/images/colorpicker_overlay.png b/3.0/modules/photo_annotation/images/colorpicker_overlay.png
similarity index 100%
rename from 3.0/modules/photoannotation/images/colorpicker_overlay.png
rename to 3.0/modules/photo_annotation/images/colorpicker_overlay.png
diff --git a/3.0/modules/photoannotation/images/colorpicker_rgb_b.png b/3.0/modules/photo_annotation/images/colorpicker_rgb_b.png
similarity index 100%
rename from 3.0/modules/photoannotation/images/colorpicker_rgb_b.png
rename to 3.0/modules/photo_annotation/images/colorpicker_rgb_b.png
diff --git a/3.0/modules/photoannotation/images/colorpicker_rgb_g.png b/3.0/modules/photo_annotation/images/colorpicker_rgb_g.png
similarity index 100%
rename from 3.0/modules/photoannotation/images/colorpicker_rgb_g.png
rename to 3.0/modules/photo_annotation/images/colorpicker_rgb_g.png
diff --git a/3.0/modules/photoannotation/images/colorpicker_rgb_r.png b/3.0/modules/photo_annotation/images/colorpicker_rgb_r.png
similarity index 100%
rename from 3.0/modules/photoannotation/images/colorpicker_rgb_r.png
rename to 3.0/modules/photo_annotation/images/colorpicker_rgb_r.png
diff --git a/3.0/modules/photoannotation/images/colorpicker_select.gif b/3.0/modules/photo_annotation/images/colorpicker_select.gif
similarity index 100%
rename from 3.0/modules/photoannotation/images/colorpicker_select.gif
rename to 3.0/modules/photo_annotation/images/colorpicker_select.gif
diff --git a/3.0/modules/photoannotation/images/colorpicker_submit.png b/3.0/modules/photo_annotation/images/colorpicker_submit.png
similarity index 100%
rename from 3.0/modules/photoannotation/images/colorpicker_submit.png
rename to 3.0/modules/photo_annotation/images/colorpicker_submit.png
diff --git a/3.0/modules/photoannotation/images/custom_background.png b/3.0/modules/photo_annotation/images/custom_background.png
similarity index 100%
rename from 3.0/modules/photoannotation/images/custom_background.png
rename to 3.0/modules/photo_annotation/images/custom_background.png
diff --git a/3.0/modules/photoannotation/images/custom_hex.png b/3.0/modules/photo_annotation/images/custom_hex.png
similarity index 100%
rename from 3.0/modules/photoannotation/images/custom_hex.png
rename to 3.0/modules/photo_annotation/images/custom_hex.png
diff --git a/3.0/modules/photoannotation/images/custom_hsb_b.png b/3.0/modules/photo_annotation/images/custom_hsb_b.png
similarity index 100%
rename from 3.0/modules/photoannotation/images/custom_hsb_b.png
rename to 3.0/modules/photo_annotation/images/custom_hsb_b.png
diff --git a/3.0/modules/photoannotation/images/custom_hsb_h.png b/3.0/modules/photo_annotation/images/custom_hsb_h.png
similarity index 100%
rename from 3.0/modules/photoannotation/images/custom_hsb_h.png
rename to 3.0/modules/photo_annotation/images/custom_hsb_h.png
diff --git a/3.0/modules/photoannotation/images/custom_hsb_s.png b/3.0/modules/photo_annotation/images/custom_hsb_s.png
similarity index 100%
rename from 3.0/modules/photoannotation/images/custom_hsb_s.png
rename to 3.0/modules/photo_annotation/images/custom_hsb_s.png
diff --git a/3.0/modules/photoannotation/images/custom_indic.gif b/3.0/modules/photo_annotation/images/custom_indic.gif
similarity index 100%
rename from 3.0/modules/photoannotation/images/custom_indic.gif
rename to 3.0/modules/photo_annotation/images/custom_indic.gif
diff --git a/3.0/modules/photoannotation/images/custom_rgb_b.png b/3.0/modules/photo_annotation/images/custom_rgb_b.png
similarity index 100%
rename from 3.0/modules/photoannotation/images/custom_rgb_b.png
rename to 3.0/modules/photo_annotation/images/custom_rgb_b.png
diff --git a/3.0/modules/photoannotation/images/custom_rgb_g.png b/3.0/modules/photo_annotation/images/custom_rgb_g.png
similarity index 100%
rename from 3.0/modules/photoannotation/images/custom_rgb_g.png
rename to 3.0/modules/photo_annotation/images/custom_rgb_g.png
diff --git a/3.0/modules/photoannotation/images/custom_rgb_r.png b/3.0/modules/photo_annotation/images/custom_rgb_r.png
similarity index 100%
rename from 3.0/modules/photoannotation/images/custom_rgb_r.png
rename to 3.0/modules/photo_annotation/images/custom_rgb_r.png
diff --git a/3.0/modules/photoannotation/images/custom_submit.png b/3.0/modules/photo_annotation/images/custom_submit.png
similarity index 100%
rename from 3.0/modules/photoannotation/images/custom_submit.png
rename to 3.0/modules/photo_annotation/images/custom_submit.png
diff --git a/3.0/modules/photoannotation/images/delete.png b/3.0/modules/photo_annotation/images/delete.png
similarity index 100%
rename from 3.0/modules/photoannotation/images/delete.png
rename to 3.0/modules/photo_annotation/images/delete.png
diff --git a/3.0/modules/photoannotation/images/edit.png b/3.0/modules/photo_annotation/images/edit.png
similarity index 100%
rename from 3.0/modules/photoannotation/images/edit.png
rename to 3.0/modules/photo_annotation/images/edit.png
diff --git a/3.0/modules/photoannotation/images/select.png b/3.0/modules/photo_annotation/images/select.png
similarity index 100%
rename from 3.0/modules/photoannotation/images/select.png
rename to 3.0/modules/photo_annotation/images/select.png
diff --git a/3.0/modules/photoannotation/images/select2.png b/3.0/modules/photo_annotation/images/select2.png
similarity index 100%
rename from 3.0/modules/photoannotation/images/select2.png
rename to 3.0/modules/photo_annotation/images/select2.png
diff --git a/3.0/modules/photoannotation/images/slider.png b/3.0/modules/photo_annotation/images/slider.png
similarity index 100%
rename from 3.0/modules/photoannotation/images/slider.png
rename to 3.0/modules/photo_annotation/images/slider.png
diff --git a/3.0/modules/photoannotation/js/jquery.annotate.js b/3.0/modules/photo_annotation/js/jquery.annotate.js
similarity index 100%
rename from 3.0/modules/photoannotation/js/jquery.annotate.js
rename to 3.0/modules/photo_annotation/js/jquery.annotate.js
diff --git a/3.0/modules/photoannotation/js/jquery.annotate.min.js b/3.0/modules/photo_annotation/js/jquery.annotate.min.js
similarity index 100%
rename from 3.0/modules/photoannotation/js/jquery.annotate.min.js
rename to 3.0/modules/photo_annotation/js/jquery.annotate.min.js
diff --git a/3.0/modules/photoannotation/js/jquery.colorpicker.js b/3.0/modules/photo_annotation/js/jquery.colorpicker.js
similarity index 100%
rename from 3.0/modules/photoannotation/js/jquery.colorpicker.js
rename to 3.0/modules/photo_annotation/js/jquery.colorpicker.js
diff --git a/3.0/modules/photoannotation/js/jquery.colorpicker.min.js b/3.0/modules/photo_annotation/js/jquery.colorpicker.min.js
similarity index 100%
rename from 3.0/modules/photoannotation/js/jquery.colorpicker.min.js
rename to 3.0/modules/photo_annotation/js/jquery.colorpicker.min.js
diff --git a/3.0/modules/photoannotation/models/items_face.php b/3.0/modules/photo_annotation/models/items_face.php
similarity index 100%
rename from 3.0/modules/photoannotation/models/items_face.php
rename to 3.0/modules/photo_annotation/models/items_face.php
diff --git a/3.0/modules/photoannotation/models/items_note.php b/3.0/modules/photo_annotation/models/items_note.php
similarity index 100%
rename from 3.0/modules/photoannotation/models/items_note.php
rename to 3.0/modules/photo_annotation/models/items_note.php
diff --git a/3.0/modules/photoannotation/models/items_user.php b/3.0/modules/photo_annotation/models/items_user.php
similarity index 100%
rename from 3.0/modules/photoannotation/models/items_user.php
rename to 3.0/modules/photo_annotation/models/items_user.php
diff --git a/3.0/modules/photoannotation/models/photoannotation_notification.php b/3.0/modules/photo_annotation/models/photoannotation_notification.php
similarity index 100%
rename from 3.0/modules/photoannotation/models/photoannotation_notification.php
rename to 3.0/modules/photo_annotation/models/photoannotation_notification.php
diff --git a/3.0/modules/photoannotation/module.info b/3.0/modules/photo_annotation/module.info
similarity index 99%
rename from 3.0/modules/photoannotation/module.info
rename to 3.0/modules/photo_annotation/module.info
index 133c2456..b603a755 100644
--- a/3.0/modules/photoannotation/module.info
+++ b/3.0/modules/photo_annotation/module.info
@@ -1,3 +1,3 @@
-name = "Photo Annotation"
-description = "Allows you to assign tags and notes to areas on your photos. This module is partially compatible with the TagFaces module by rWatcher. This means that notes and faces that you create in either one will be shown and are editable by the other module as well. If you added users to an annotation area though they will only be displayed with the Photo Annotation module. You cannot run both modules at the same time."
-version = 4
+name = "Photo Annotation"
+description = "Allows you to assign tags and notes to areas on your photos. This module is partially compatible with the TagFaces module by rWatcher. This means that notes and faces that you create in either one will be shown and are editable by the other module as well. If you added users to an annotation area though they will only be displayed with the Photo Annotation module. You cannot run both modules at the same time."
+version = 4
diff --git a/3.0/modules/photoannotation/views/admin_photoannotation.html.php b/3.0/modules/photo_annotation/views/admin_photoannotation.html.php
similarity index 100%
rename from 3.0/modules/photoannotation/views/admin_photoannotation.html.php
rename to 3.0/modules/photo_annotation/views/admin_photoannotation.html.php
diff --git a/3.0/modules/photoannotation/views/admin_photoannotation_converter.html.php b/3.0/modules/photo_annotation/views/admin_photoannotation_converter.html.php
similarity index 100%
rename from 3.0/modules/photoannotation/views/admin_photoannotation_converter.html.php
rename to 3.0/modules/photo_annotation/views/admin_photoannotation_converter.html.php
diff --git a/3.0/modules/photoannotation/views/admin_photoannotation_tagsmaintanance.html.php b/3.0/modules/photo_annotation/views/admin_photoannotation_tagsmaintanance.html.php
similarity index 100%
rename from 3.0/modules/photoannotation/views/admin_photoannotation_tagsmaintanance.html.php
rename to 3.0/modules/photo_annotation/views/admin_photoannotation_tagsmaintanance.html.php
diff --git a/3.0/modules/photoannotation/views/photoannotation_block.html.php b/3.0/modules/photo_annotation/views/photoannotation_block.html.php
similarity index 100%
rename from 3.0/modules/photoannotation/views/photoannotation_block.html.php
rename to 3.0/modules/photo_annotation/views/photoannotation_block.html.php
diff --git a/3.0/modules/photoannotation/views/photoannotation_cloud.html.php b/3.0/modules/photo_annotation/views/photoannotation_cloud.html.php
similarity index 100%
rename from 3.0/modules/photoannotation/views/photoannotation_cloud.html.php
rename to 3.0/modules/photo_annotation/views/photoannotation_cloud.html.php
diff --git a/3.0/modules/photoannotation/views/photoannotation_highlight_block.html.php b/3.0/modules/photo_annotation/views/photoannotation_highlight_block.html.php
similarity index 100%
rename from 3.0/modules/photoannotation/views/photoannotation_highlight_block.html.php
rename to 3.0/modules/photo_annotation/views/photoannotation_highlight_block.html.php
diff --git a/3.0/modules/photoannotation/views/photoannotation_user_search.html.php b/3.0/modules/photo_annotation/views/photoannotation_user_search.html.php
similarity index 100%
rename from 3.0/modules/photoannotation/views/photoannotation_user_search.html.php
rename to 3.0/modules/photo_annotation/views/photoannotation_user_search.html.php