diff --git a/src/include/switch_buffer.h b/src/include/switch_buffer.h
index 64fbf74543..ff05db1a6c 100644
--- a/src/include/switch_buffer.h
+++ b/src/include/switch_buffer.h
@@ -46,7 +46,7 @@ extern "C" {
 
 /**
  * @defgroup switch_buffer Buffer Routines
- * @ingroup FREESWITCH 
+ * @ingroup core1
  * The purpose of this module is to make a plain buffering interface that can be used for read/write buffers
  * throughout the application.  The first implementation was done to provide the functionality and the interface
  * and I think it can be optimized under the hood as we go using bucket brigades and/or ring buffering techniques.
diff --git a/src/include/switch_caller.h b/src/include/switch_caller.h
index 2234ed2465..9eaba7d92f 100644
--- a/src/include/switch_caller.h
+++ b/src/include/switch_caller.h
@@ -36,7 +36,7 @@
  */
 /**
  * @defgroup caller Caller Identity / Dialplan
- * @ingroup FREESWITCH 
+ * @ingroup core1
  *
  *	This module implements a caller profile which is a group of information about a connected endpoint
  *	such as common caller id and other useful information such as ip address and destination number.
diff --git a/src/include/switch_channel.h b/src/include/switch_channel.h
index bae9adc42b..23bb912749 100644
--- a/src/include/switch_channel.h
+++ b/src/include/switch_channel.h
@@ -52,7 +52,7 @@ typedef struct {
 
 /**
  * @defgroup switch_channel Channel Functions
- * @ingroup FREESWITCH
+ * @ingroup core1
  *	The switch_channel object is a private entity that belongs to a session that contains the call
  *	specific information such as the call state, variables, caller profiles and DTMF queue
  * @{
diff --git a/src/include/switch_config.h b/src/include/switch_config.h
index fe440524cc..f2ea148271 100644
--- a/src/include/switch_config.h
+++ b/src/include/switch_config.h
@@ -37,7 +37,7 @@
 
 /**
  * @defgroup config Config File Parser
- * @ingroup FREESWITCH 
+ * @ingroup core1
  * This module implements a basic interface and file format parser it may be depricated in favor of database entries
  * or expanded to tie to external handlers in the future as necessary.
  * <pre>
diff --git a/src/include/switch_event.h b/src/include/switch_event.h
index 4a5bf052aa..604d4ee9ea 100644
--- a/src/include/switch_event.h
+++ b/src/include/switch_event.h
@@ -51,7 +51,7 @@
 
 /*!
   \defgroup events Eventing Engine
-  \ingroup FREESWITCH
+  \ingroup core1
   \{ 
 */
 
diff --git a/src/include/switch_ivr.h b/src/include/switch_ivr.h
index 3544450db7..ced4ad0c26 100644
--- a/src/include/switch_ivr.h
+++ b/src/include/switch_ivr.h
@@ -46,7 +46,7 @@ extern "C" {
 
 /**
  * @defgroup switch_ivr IVR Library
- * @ingroup FREESWITCH
+ * @ingroup core1
  *	A group of core functions to do IVR related functions designed to be 
  *	building blocks for a higher level IVR interface.
  * @{
diff --git a/src/include/switch_loadable_module.h b/src/include/switch_loadable_module.h
index 2c7c3fc90f..7d9b2e34bb 100644
--- a/src/include/switch_loadable_module.h
+++ b/src/include/switch_loadable_module.h
@@ -49,7 +49,7 @@ extern "C" {
 
 /*!
   \defgroup mods Loadable Module Functions
-  \ingroup FREESWITCH
+  \ingroup core1
   \{ 
 */
 
diff --git a/src/include/switch_resample.h b/src/include/switch_resample.h
index 7f6b49ecdd..a385d5ed20 100644
--- a/src/include/switch_resample.h
+++ b/src/include/switch_resample.h
@@ -48,6 +48,12 @@ extern "C" {
 #include <stdlib.h>
 #include <switch.h>
 
+/*!
+  \defgroup resamp Audio Resample Functions
+  \ingroup core1
+  \{ 
+*/
+
 /*! \brief An audio resampling handle */
 struct switch_audio_resampler {
 	/*! a pointer to store the resampler object */
@@ -150,6 +156,8 @@ SWITCH_DECLARE(int) switch_short_to_float(short *s, float *f, int len);
  */
 SWITCH_DECLARE(void) switch_swap_linear(int16_t *buf, int len);
 
+///\}
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/include/switch_sqlite.h b/src/include/switch_sqlite.h
index 5154862fbd..cc893dce19 100644
--- a/src/include/switch_sqlite.h
+++ b/src/include/switch_sqlite.h
@@ -43,7 +43,7 @@ extern "C" {
 
 /**
  * @defgroup switch_sqlite_top Brought To You By SQLite
- * @ingroup FREESWITCH 
+ * @ingroup FREESWITCH
  * @{
  */
 
diff --git a/src/include/switch_stun.h b/src/include/switch_stun.h
index 213edd81fe..46b768d9a3 100644
--- a/src/include/switch_stun.h
+++ b/src/include/switch_stun.h
@@ -31,7 +31,7 @@
  */
 /*!
   \defgroup stun1 STUN code
-  \ingroup FREESWITCH
+  \ingroup core1
   \{
 */
 #ifndef _SWITCH_STUN_PARSER_H