diff --git a/plugins/fedora_imageapi.info b/api/fedora_imageapi.info
similarity index 100%
rename from plugins/fedora_imageapi.info
rename to api/fedora_imageapi.info
diff --git a/plugins/fedora_imageapi.module b/api/fedora_imageapi.module
similarity index 98%
rename from plugins/fedora_imageapi.module
rename to api/fedora_imageapi.module
index f3bd4481..99c2cfd2 100644
--- a/plugins/fedora_imageapi.module
+++ b/api/fedora_imageapi.module
@@ -1,7 +1,9 @@
 <?php
 
-
-
+/**
+ * fedora imageapi menu 
+ * @return string 
+ */
 function fedora_imageapi_menu() {
   $items = array();
   $items['fedora/imageapi'] = array(
diff --git a/plugins/CollectionFormBuilder.inc b/plugins/CollectionFormBuilder.inc
index 93e11479..83624d38 100644
--- a/plugins/CollectionFormBuilder.inc
+++ b/plugins/CollectionFormBuilder.inc
@@ -1,7 +1,5 @@
 <?php
 
-
-
 /**
  * @file
  * Collection Form Builder
@@ -12,8 +10,8 @@ module_load_include('inc', 'fedora_repository', 'plugins/FormBuilder');
 /**
  * implements methods from content model ingest form xml
  * builds a dc metadata form
+ * @deprecated
  */
-
 class CollectionFormBuilder extends FormBuilder {
 
   /**
diff --git a/plugins/CreateCollection.inc b/plugins/CreateCollection.inc
index c02ac2b7..c29eb657 100644
--- a/plugins/CreateCollection.inc
+++ b/plugins/CreateCollection.inc
@@ -9,6 +9,7 @@
 
 /**
  * This Class implements the methods defined in the STANDARD_IMAGE content model
+ * @deprecated
  */
 class CreateCollection {
 
diff --git a/plugins/DarwinCore.inc b/plugins/DarwinCore.inc
index 2d66d60a..dc698521 100644
--- a/plugins/DarwinCore.inc
+++ b/plugins/DarwinCore.inc
@@ -1,18 +1,13 @@
 <?php
 
-/* @file
-
-
-
-*/
-
 /**
  * @file
  * Darwin Core class
  */
 
 /**
- * Darwin Core ???
+ * Darwin Core
+ * @deprecated
  */
 class DarwinCore {
 
diff --git a/plugins/DemoFormBuilder.inc b/plugins/DemoFormBuilder.inc
index 05a9304f..305c2029 100644
--- a/plugins/DemoFormBuilder.inc
+++ b/plugins/DemoFormBuilder.inc
@@ -1,7 +1,5 @@
 <?php
 
-
-
 /**
  * @file
  * 
@@ -11,8 +9,8 @@ module_load_include('inc', 'fedora_repository', 'plugins/FormBuilder');
 /**
  * implements methods from content model ingest form xml
  * builds a dc metadata form
+ * @deprecated
  */
-
 class DemoFormBuilder extends FormBuilder {
 
   /**
diff --git a/plugins/DocumentConverter.inc b/plugins/DocumentConverter.inc
index f258441a..ce782f08 100644
--- a/plugins/DocumentConverter.inc
+++ b/plugins/DocumentConverter.inc
@@ -1,6 +1,5 @@
 <?php
 
-
 /**
  * @file
  * Document Converter Class
@@ -9,6 +8,7 @@
 /**
  * This class implements document (doc, odt, pdf, etc.) conversion for a generic
  * multi-format document collection.
+ * @deprecated
  */
 class DocumentConverter {
 
diff --git a/plugins/Exiftool.inc b/plugins/Exiftool.inc
index d8fd5e90..002c6b0c 100644
--- a/plugins/Exiftool.inc
+++ b/plugins/Exiftool.inc
@@ -1,7 +1,5 @@
 <?php
 
-
-
 /**
  * @file
  * Exiftool
@@ -9,6 +7,7 @@
 
 /**
  * This Class implements the methods defined in the STANDARD_IMAGE content model
+ * @deprecated
  */
 class Exiftool {
 
diff --git a/plugins/FedoraObjectDetailedContent.inc b/plugins/FedoraObjectDetailedContent.inc
index 4f3d9a74..ea70642b 100644
--- a/plugins/FedoraObjectDetailedContent.inc
+++ b/plugins/FedoraObjectDetailedContent.inc
@@ -1,7 +1,5 @@
 <?php
 
-
-
 /**
  * @file
  * FedoraObjectDetailedContent class
@@ -11,6 +9,7 @@
  * Fedora Object. This class is a plugin called from content models to display a detailed list of 
  * content of the Fedora Item. This is hard coded into Islandora core, and it can also be called
  * from the IslandoraCM stream.
+ * @deprecated
  */
 class FedoraObjectDetailedContent {
 
diff --git a/plugins/Ffmpeg.inc b/plugins/Ffmpeg.inc
index 46b4ae80..7c2159ed 100644
--- a/plugins/Ffmpeg.inc
+++ b/plugins/Ffmpeg.inc
@@ -1,7 +1,5 @@
 <?php
 
-
-
 /**
  * @file
  * Ffmpeg wrapper class
@@ -11,6 +9,7 @@
  * FFMpeg wrapper class for generating movie thumbnails
  * 
  * This Class implements the methods defined in the STANDARD_QT content model
+ * @deprecated
  */
 class Ffmpeg {
 
diff --git a/plugins/Flv.inc b/plugins/Flv.inc
index b5f159b2..76506ce3 100644
--- a/plugins/Flv.inc
+++ b/plugins/Flv.inc
@@ -1,7 +1,5 @@
 <?php
 
-
-
 /**
  * @file
  * Form Builder class
@@ -9,6 +7,7 @@
 
 /**
  * implements method from content model ingest form xml
+ * @deprecated
  */
 class FormBuilder {
 
diff --git a/plugins/FlvFormBuilder.inc b/plugins/FlvFormBuilder.inc
index 8c2b5777..5e022b88 100644
--- a/plugins/FlvFormBuilder.inc
+++ b/plugins/FlvFormBuilder.inc
@@ -1,7 +1,5 @@
 <?php
 
-
-
 /**
  * @file
  * FLVFormBuilder
@@ -11,8 +9,8 @@ module_load_include('inc', 'fedora_repository', 'plugins/FormBuilder');
 /**
  * implements methods from content model ingest form xml
  * builds a dc metadata form
+ * @deprecated
  */
-
 class FlvFormBuilder extends FormBuilder {
 
   /**
diff --git a/plugins/FormBuilder.inc b/plugins/FormBuilder.inc
index cd9dc4a9..02ca6ace 100644
--- a/plugins/FormBuilder.inc
+++ b/plugins/FormBuilder.inc
@@ -1,7 +1,5 @@
 <?php
 
-
-
 /**
  * @file
  * FormBuilder class
@@ -10,6 +8,7 @@
 /**
  * implements methods from content model ingest form xml
  * builds a dc metadata form
+ * @deprecated
  */
 class FormBuilder {
 
diff --git a/plugins/ImageManipulation.inc b/plugins/ImageManipulation.inc
index 4faabdd8..bbbe84fd 100644
--- a/plugins/ImageManipulation.inc
+++ b/plugins/ImageManipulation.inc
@@ -1,7 +1,5 @@
 <?php
 
-
-
 /**
  * @file
  * Image Manipulation class
@@ -9,6 +7,7 @@
 
 /**
  * This Class implements the methods defined in the STANDARD_IMAGE content model
+ * @deprecated
  */
 class ImageManipulation {
 
diff --git a/plugins/ModsFormBuilder.inc b/plugins/ModsFormBuilder.inc
index aa0f6f92..c7eefdb6 100644
--- a/plugins/ModsFormBuilder.inc
+++ b/plugins/ModsFormBuilder.inc
@@ -1,7 +1,5 @@
 <?php
 
-
-
 /**
  * @file
  * ModsFormBuilder class
@@ -9,7 +7,8 @@
 module_load_include('inc', 'fedora_repository', 'plugins/FormBuilder');
 
 /**
- * ModsFormBuilder class ???
+ * ModsFormBuilder class
+ * @deprecated
  */
 class ModsFormBuilder extends FormBuilder {
 
diff --git a/plugins/PersonalCollectionClass.inc b/plugins/PersonalCollectionClass.inc
index 29c76cfa..b81d75df 100644
--- a/plugins/PersonalCollectionClass.inc
+++ b/plugins/PersonalCollectionClass.inc
@@ -1,7 +1,5 @@
 <?php
 
-
-
 /**
  * @file
  * PersonalCollectionClass class
@@ -9,6 +7,7 @@
 
 /**
  * Personal Collection Class
+ * @deprecated
  */
 class PersonalCollectionClass {
 
diff --git a/plugins/QtFormBuilder.php b/plugins/QtFormBuilder.php
index 28645d6b..95b7699c 100644
--- a/plugins/QtFormBuilder.php
+++ b/plugins/QtFormBuilder.php
@@ -1,7 +1,5 @@
 <?php
 
-// $Id$
-
 /**
  * @file
  * QTFormBuilder class
@@ -11,6 +9,7 @@ module_load_include('inc', 'fedora_repository', 'plugins/FormBuilder');
 /**
  * Implements methods from content model ingest form xml
  *  builds a dc metadata form
+ * @deprecated
  */
 class QtFormBuilder extends FormBuilder {
 
diff --git a/plugins/Refworks.inc b/plugins/Refworks.inc
index 5e39b3c2..e539520c 100644
--- a/plugins/Refworks.inc
+++ b/plugins/Refworks.inc
@@ -10,7 +10,8 @@
 module_load_include('inc', 'fedora_repository', 'SecurityClass');
 
 /**
- * Refworks class ???
+ * Refworks class
+ * @deprecated
  */
 class Refworks {
 
diff --git a/plugins/ShowDemoStreamsInFieldSets.inc b/plugins/ShowDemoStreamsInFieldSets.inc
index 80f8017c..05c2dbd8 100644
--- a/plugins/ShowDemoStreamsInFieldSets.inc
+++ b/plugins/ShowDemoStreamsInFieldSets.inc
@@ -8,7 +8,8 @@
  */
 
 /**
- * Show Demo Streams in Field Sets ???
+ * Show Demo Streams in Field Sets
+ * @deprecated
  */
 class ShowDemoStreamsInFieldSets {
 
diff --git a/plugins/ShowStreamsInFieldSets.inc b/plugins/ShowStreamsInFieldSets.inc
index a6e7eaad..3fc116d2 100644
--- a/plugins/ShowStreamsInFieldSets.inc
+++ b/plugins/ShowStreamsInFieldSets.inc
@@ -8,7 +8,8 @@
  */
 
 /**
- * Show Streams In Field Sets ??
+ * Show Streams In Field Sets
+ * @deprecated
  */
 class ShowStreamsInFieldSets {
 
diff --git a/plugins/herbarium.inc b/plugins/herbarium.inc
index f7a6d685..fa2ac4a7 100644
--- a/plugins/herbarium.inc
+++ b/plugins/herbarium.inc
@@ -1,20 +1,20 @@
 <?php
 
-/**
- * @file 
- * 
- */
-
 /**
  * @file
  * Herbarium class
  */
 
 /**
- * Herbarium ???
+ * Herbarium Class
+ * @deprecated
  */
 class Herbarium {
 
+  /**
+   * Constructor
+   * @param type $pid 
+   */
   function __construct($pid = '') {
     module_load_include('inc', 'fedora_repository', 'api/fedora_item');
     if (!empty($pid)) {
diff --git a/plugins/map_viewer.inc b/plugins/map_viewer.inc
index f3bfca80..7b9cdf1d 100644
--- a/plugins/map_viewer.inc
+++ b/plugins/map_viewer.inc
@@ -1,14 +1,13 @@
 <?php
 
-
-
 /**
  * @file
  * ShowMapStreamsInFieldSets class
  */
 
 /**
- * Show Map Streams in Field Sets Class ??
+ * Show Map Streams in Field Sets Class
+ * @deprecated
  */
 class ShowMapStreamsInFieldSets {
 
diff --git a/plugins/qt_viewer.inc b/plugins/qt_viewer.inc
index e52e4363..46984cf2 100644
--- a/plugins/qt_viewer.inc
+++ b/plugins/qt_viewer.inc
@@ -1,7 +1,5 @@
 <?php
 
-
-
 /**
  * @file
  * ShowQTStreamsInFieldSets class
@@ -9,6 +7,7 @@
 
 /**
  * Show QT Stream in Field Sets
+ * @deprecated
  */
 class ShowQtStreamsInFieldSets {
 
diff --git a/plugins/slide_viewer.inc b/plugins/slide_viewer.inc
index 45ff3f9d..b7c3cf41 100644
--- a/plugins/slide_viewer.inc
+++ b/plugins/slide_viewer.inc
@@ -1,14 +1,13 @@
 <?php
 
-
-
 /**
  * @file
  * ShowSlideStreamsInFieldSets class
  */
 
 /**
- * ShowSlideStreamInFieldSets ??????
+ * ShowSlideStreamInFieldSets
+ * @deprecated
  */
 class ShowSlideStreamsInFieldSets {
 
diff --git a/plugins/tagging_form.inc b/plugins/tagging_form.inc
index 390bf36c..d3931957 100644
--- a/plugins/tagging_form.inc
+++ b/plugins/tagging_form.inc
@@ -1,7 +1,5 @@
 <?php
 
-
-
 /**
  * @file
  * Tagging Form???
@@ -11,6 +9,7 @@
  * Show subject tags ???
  * @param type $pid
  * @return string 
+ * @deprecated
  */
 function _show_subject_tags($pid) {
   module_load_include('inc', 'fedora_repository', 'api/fedora_item');
@@ -34,6 +33,7 @@ function _show_subject_tags($pid) {
  * @param type $form_state
  * @param type $pid
  * @return type 
+ * @deprecated
  */
 function fedora_repository_image_tagging_form($form_state, $pid) {
   module_load_include('inc', 'fedora_repository', 'api/fedora_item');
@@ -105,6 +105,7 @@ function fedora_repository_image_tagging_form($form_state, $pid) {
  * Hook image button process ???
  * @param type $form
  * @return string 
+ * @deprecated
  */
 function hook_imagebutton_process($form) {
   $form['op_x'] = array(
@@ -121,6 +122,7 @@ function hook_imagebutton_process($form) {
  * @global type $user
  * @param type $form
  * @param type $form_state 
+ * @deprecated
  */
 function fedora_repository_image_tagging_form_submit($form, &$form_state) {
   module_load_include('inc', 'fedora_repository', 'api/fedora_item');