diff --git a/bigbluebutton-html5/imports/api/1.1/shapes/index.js b/bigbluebutton-html5/imports/api/1.1/annotations/index.js
old mode 100755
new mode 100644
similarity index 100%
rename from bigbluebutton-html5/imports/api/1.1/shapes/index.js
rename to bigbluebutton-html5/imports/api/1.1/annotations/index.js
diff --git a/bigbluebutton-html5/imports/api/1.1/shapes/server/eventHandlers.js b/bigbluebutton-html5/imports/api/1.1/annotations/server/eventHandlers.js
old mode 100755
new mode 100644
similarity index 100%
rename from bigbluebutton-html5/imports/api/1.1/shapes/server/eventHandlers.js
rename to bigbluebutton-html5/imports/api/1.1/annotations/server/eventHandlers.js
diff --git a/bigbluebutton-html5/imports/api/1.1/shapes/server/handlers/whiteboardGetReply.js b/bigbluebutton-html5/imports/api/1.1/annotations/server/handlers/whiteboardAnnotations.js
old mode 100755
new mode 100644
similarity index 100%
rename from bigbluebutton-html5/imports/api/1.1/shapes/server/handlers/whiteboardGetReply.js
rename to bigbluebutton-html5/imports/api/1.1/annotations/server/handlers/whiteboardAnnotations.js
diff --git a/bigbluebutton-html5/imports/api/1.1/shapes/server/handlers/whiteboardCleared.js b/bigbluebutton-html5/imports/api/1.1/annotations/server/handlers/whiteboardCleared.js
old mode 100755
new mode 100644
similarity index 100%
rename from bigbluebutton-html5/imports/api/1.1/shapes/server/handlers/whiteboardCleared.js
rename to bigbluebutton-html5/imports/api/1.1/annotations/server/handlers/whiteboardCleared.js
diff --git a/bigbluebutton-html5/imports/api/1.1/shapes/server/handlers/whiteboardSend.js b/bigbluebutton-html5/imports/api/1.1/annotations/server/handlers/whiteboardSend.js
old mode 100755
new mode 100644
similarity index 100%
rename from bigbluebutton-html5/imports/api/1.1/shapes/server/handlers/whiteboardSend.js
rename to bigbluebutton-html5/imports/api/1.1/annotations/server/handlers/whiteboardSend.js
diff --git a/bigbluebutton-html5/imports/api/1.1/shapes/server/handlers/whiteboardUndo.js b/bigbluebutton-html5/imports/api/1.1/annotations/server/handlers/whiteboardUndo.js
old mode 100755
new mode 100644
similarity index 100%
rename from bigbluebutton-html5/imports/api/1.1/shapes/server/handlers/whiteboardUndo.js
rename to bigbluebutton-html5/imports/api/1.1/annotations/server/handlers/whiteboardUndo.js
diff --git a/bigbluebutton-html5/imports/api/1.1/shapes/server/index.js b/bigbluebutton-html5/imports/api/1.1/annotations/server/index.js
old mode 100755
new mode 100644
similarity index 100%
rename from bigbluebutton-html5/imports/api/1.1/shapes/server/index.js
rename to bigbluebutton-html5/imports/api/1.1/annotations/server/index.js
diff --git a/bigbluebutton-html5/imports/api/1.1/shapes/server/methods.js b/bigbluebutton-html5/imports/api/1.1/annotations/server/methods.js
old mode 100755
new mode 100644
similarity index 100%
rename from bigbluebutton-html5/imports/api/1.1/shapes/server/methods.js
rename to bigbluebutton-html5/imports/api/1.1/annotations/server/methods.js
diff --git a/bigbluebutton-html5/imports/api/1.1/shapes/server/methods/clearWhiteboard.js b/bigbluebutton-html5/imports/api/1.1/annotations/server/methods/clearWhiteboard.js
old mode 100755
new mode 100644
similarity index 100%
rename from bigbluebutton-html5/imports/api/1.1/shapes/server/methods/clearWhiteboard.js
rename to bigbluebutton-html5/imports/api/1.1/annotations/server/methods/clearWhiteboard.js
diff --git a/bigbluebutton-html5/imports/api/1.1/shapes/server/methods/sendAnnotation.js b/bigbluebutton-html5/imports/api/1.1/annotations/server/methods/sendAnnotation.js
old mode 100755
new mode 100644
similarity index 100%
rename from bigbluebutton-html5/imports/api/1.1/shapes/server/methods/sendAnnotation.js
rename to bigbluebutton-html5/imports/api/1.1/annotations/server/methods/sendAnnotation.js
diff --git a/bigbluebutton-html5/imports/api/1.1/shapes/server/methods/undoAnnotation.js b/bigbluebutton-html5/imports/api/1.1/annotations/server/methods/undoAnnotation.js
old mode 100755
new mode 100644
similarity index 100%
rename from bigbluebutton-html5/imports/api/1.1/shapes/server/methods/undoAnnotation.js
rename to bigbluebutton-html5/imports/api/1.1/annotations/server/methods/undoAnnotation.js
diff --git a/bigbluebutton-html5/imports/api/1.1/shapes/server/modifiers/addShape.js b/bigbluebutton-html5/imports/api/1.1/annotations/server/modifiers/addAnnotation.js
old mode 100755
new mode 100644
similarity index 100%
rename from bigbluebutton-html5/imports/api/1.1/shapes/server/modifiers/addShape.js
rename to bigbluebutton-html5/imports/api/1.1/annotations/server/modifiers/addAnnotation.js
diff --git a/bigbluebutton-html5/imports/api/1.1/shapes/server/modifiers/clearShapes.js b/bigbluebutton-html5/imports/api/1.1/annotations/server/modifiers/clearAnnotations.js
old mode 100755
new mode 100644
similarity index 100%
rename from bigbluebutton-html5/imports/api/1.1/shapes/server/modifiers/clearShapes.js
rename to bigbluebutton-html5/imports/api/1.1/annotations/server/modifiers/clearAnnotations.js
diff --git a/bigbluebutton-html5/imports/api/1.1/shapes/server/modifiers/removeShape.js b/bigbluebutton-html5/imports/api/1.1/annotations/server/modifiers/removeAnnotation.js
old mode 100755
new mode 100644
similarity index 100%
rename from bigbluebutton-html5/imports/api/1.1/shapes/server/modifiers/removeShape.js
rename to bigbluebutton-html5/imports/api/1.1/annotations/server/modifiers/removeAnnotation.js
diff --git a/bigbluebutton-html5/imports/api/1.1/shapes/server/publishers.js b/bigbluebutton-html5/imports/api/1.1/annotations/server/publishers.js
old mode 100755
new mode 100644
similarity index 100%
rename from bigbluebutton-html5/imports/api/1.1/shapes/server/publishers.js
rename to bigbluebutton-html5/imports/api/1.1/annotations/server/publishers.js