Index: branches/1.1.x/units/sections/e_link_eh.php
===================================================================
diff -u -N
--- branches/1.1.x/units/sections/e_link_eh.php	(revision 13093)
+++ branches/1.1.x/units/sections/e_link_eh.php	(revision 0)
@@ -1,188 +0,0 @@
-<?php
-
-	defined('FULL_PATH') or die('restricted access!');
-
-	/**
-	 * Extends default LinksEventHandler class
-	 *
-	 */
-	class ELinkEventHandler extends LinksEventHandler {
-
-		/**
-		 * Allows to override standard permission mapping
-		 *
-		 */
-		function mapPermissions()
-		{
-			parent::mapPermissions();
-
-			$permissions = Array (
-				# admin
-				'OnCustomEvent1' => Array ('self' => true),
-
-				# front
-				'OnCustomEvent2' => Array ('self' => true),
-			);
-
-			$this->permMapping = array_merge($this->permMapping, $permissions);
-		}
-
-		/**
-		 * Permission exceptions
-		 *
-		 * @param kEvent $event
-		 */
-		function CheckPermission(&$event)
-		{
-			$skip_permissions_check_events = Array (
-				'OnAnotherCustomEvent',
-			);
-
-			if ( in_array($event->Name, $skip_permissions_check_events) ) {
-				return true;
-			}
-
-			return parent::CheckPermission($event);
-		}
-
-		/**
-		 * Updates structure config
-		 *
-		 * @param kEvent $event
-		 */
-		function OnAfterConfigRead(&$event)
-		{
-			parent::OnAfterConfigRead($event);
-
-			# 1. Regular Fields from /in-link/units/links/links_config.php
-			$fields = $this->Application->getUnitOption($event->Prefix, 'Fields'); #get regular fields
-//			$fields['Status']['default'] = STATUS_ACTIVE; #add/edit configuration (make default = STATUS_ACTIVE)
-			$this->Application->setUnitOption($event->Prefix, 'Fields', $fields); #save fields
-
-			# 2. Virtual Fields from /in-link/units/links/links_config.php
-			$virtual_fields = $this->Application->getUnitOption($event->Prefix, 'VirtualFields'); #get virtual fields
-//			$virtual_fields['UserName']['default'] = ''; #add/edit configuration
-			$this->Application->setUnitOption($event->Prefix, 'VirtualFields', $virtual_fields); #save virtual fields
-		}
-
-		/**
-		 * Sets custom query for the list
-		 *
-		 * @param kEvent $event
-		 */
-		function SetCustomQuery(&$event)
-		{
-			parent::SetCustomQuery($event);
-
-			$object =& $event->getObject();
-			/* @var $object kDBList */
-
-			# identifying event based on special and setting filter
-			if ($event->Special == 'custom-special') {
-//				$object->addFilter('primary_filter', '%1$s.Status = ' . STATUS_DISABLED);
-			}
-
-			# identifying event based not admin condition and setting filter
-			if (!$this->Application->isAdminUser) {
-//				$object->addFilter('status_filter', '%1$s.Status = ' . STATUS_ACTIVE);
-			}
-		}
-
-		/**
-		 * Before new item created
-		 *
-		 * @param kEvent $event
-		 */
-		function OnBeforeItemCreate(&$event)
-		{
-			parent::OnBeforeItemCreate($event);
-
-
-		}
-
-		/**
-		 * Before existing item updated
-		 *
-		 * @param kEvent $event
-		 */
-		function OnBeforeItemUpdate(&$event)
-		{
-			parent::OnBeforeItemUpdate($event);
-
-
-		}
-
-		/**
-		 * Before item deleted
-		 *
-		 * @param kEvent $event
-		 */
-		function OnBeforeItemDelete(&$event)
-		{
-			parent::OnBeforeItemDelete($event);
-
-
-		}
-
-		/**
-		 * After item loaded
-		 *
-		 * @param kEvent $event
-		 */
-		function OnBeforeItemLoad(&$event)
-		{
-			parent::OnBeforeItemLoad($event);
-
-
-		}
-
-
-		/**
-		 * After new item created
-		 *
-		 * @param kEvent $event
-		 */
-		function OnAfterItemCreate(&$event)
-		{
-			parent::OnAfterItemCreate($event);
-
-
-		}
-
-		/**
-		 * After existing item updated
-		 *
-		 * @param kEvent $event
-		 */
-		function OnAfterItemUpdate(&$event)
-		{
-			parent::OnAfterItemUpdate($event);
-
-
-		}
-
-		/**
-		 * After item deleted
-		 *
-		 * @param kEvent $event
-		 */
-		function OnAfterItemDelete(&$event)
-		{
-			parent::OnAfterItemDelete($event);
-
-
-		}
-
-		/**
-		 * After item loaded
-		 *
-		 * @param kEvent $event
-		 */
-		function OnAfterItemLoad(&$event)
-		{
-			parent::OnAfterItemLoad($event);
-
-
-		}
-
-	}
\ No newline at end of file
Index: branches/1.1.x/units/sections/e_article_tp.php
===================================================================
diff -u -N
--- branches/1.1.x/units/sections/e_article_tp.php	(revision 13093)
+++ branches/1.1.x/units/sections/e_article_tp.php	(revision 0)
@@ -1,28 +0,0 @@
-<?php
-
-	defined('FULL_PATH') or die('restricted access!');
-
-	/**
-	 * Extends default ArticlesTagProcessor class
-	 *
-	 */
-	class EArticleTagProcessor extends ArticlesTagProcessor {
-
-		/**
-		 * Adding custom processing to existing Field method
-		 *
-		 * @param Array $params
-		 * @return string
-		 */
-		function FormattedField($params)
-		{
-			// get from parent
-			$o = parent::Field($params);
-
-			// do some custom stuff here
-			$o = trim($o);
-
-			return $o;
-		}
-		
-	}
Index: branches/1.1.x/units/sections/e_review_eh.php
===================================================================
diff -u -N
--- branches/1.1.x/units/sections/e_review_eh.php	(revision 13093)
+++ branches/1.1.x/units/sections/e_review_eh.php	(revision 0)
@@ -1,127 +0,0 @@
-<?php
-
-	defined('FULL_PATH') or die('restricted access!');
-
-	/**
-	 * Extends/overrides methods of default ReviewsEventHandler class
-	 *
-	 */
-
-	class EReviewEventHandler extends ReviewsEventHandler {
-		/**
-		 * Makes left join to item's table, when in separate grid
-		 *
-		 * @param kEvent $event
-		 */
-		function OnAfterConfigRead(&$event)
-		{
-			parent::OnAfterConfigRead($event);
-
-			// 1. add fields
-//			$fields = $this->Application->getUnitOption($event->Prefix, 'Fields');
-//			$this->Application->setUnitOption($event->Prefix, 'Fields', $fields);
-					
-			// 2. calculated fields
-//			$calculated_fields = $this->Application->getUnitOption($event->Prefix, 'CalculatedFields');			
-//			$this->Application->setUnitOption($event->Prefix, 'CalculatedFields', $calculated_fields);
-		}
-
-				
-		/**
-		 * Before new item created
-		 *
-		 * @param kEvent $event
-		 */
-		function OnBeforeItemCreate(&$event)
-		{
-			parent::OnBeforeItemCreate($event);
-
-
-		}
-
-		/**
-		 * Before existing item updated
-		 *
-		 * @param kEvent $event
-		 */
-		function OnBeforeItemUpdate(&$event)
-		{
-			parent::OnBeforeItemUpdate($event);
-
-
-		}
-
-		/**
-		 * Before item deleted
-		 *
-		 * @param kEvent $event
-		 */
-		function OnBeforeItemDelete(&$event)
-		{
-			parent::OnBeforeItemDelete($event);
-
-
-		}
-
-		/**
-		 * After item loaded
-		 *
-		 * @param kEvent $event
-		 */
-		function OnBeforeItemLoad(&$event)
-		{
-			parent::OnBeforeItemLoad($event);
-
-
-		}
-
-
-		/**
-		 * After new item created
-		 *
-		 * @param kEvent $event
-		 */
-		function OnAfterItemCreate(&$event)
-		{
-			parent::OnAfterItemCreate($event);
-
-
-		}
-
-		/**
-		 * After existing item updated
-		 *
-		 * @param kEvent $event
-		 */
-		function OnAfterItemUpdate(&$event)
-		{
-			parent::OnAfterItemUpdate($event);
-
-
-		}
-
-		/**
-		 * After item deleted
-		 *
-		 * @param kEvent $event
-		 */
-		function OnAfterItemDelete(&$event)
-		{
-			parent::OnAfterItemDelete($event);
-
-
-		}
-
-		/**
-		 * After item loaded
-		 *
-		 * @param kEvent $event
-		 */
-		function OnAfterItemLoad(&$event)
-		{
-			parent::OnAfterItemLoad($event);
-
-
-		}
-		
-	}
Index: branches/1.1.x/units/sections/custom_eh.php
===================================================================
diff -u -N -r14036 -r14239
--- branches/1.1.x/units/sections/custom_eh.php	(.../custom_eh.php)	(revision 14036)
+++ branches/1.1.x/units/sections/custom_eh.php	(.../custom_eh.php)	(revision 14239)
@@ -30,7 +30,7 @@
 		function OnOverrideClonedSubItems(&$event)
 		{
 			# register EReviewEventHandler class as extented from cloned ReviewEventHandler for article reviews ("n" prefix)
-//			$this->Application->registerClass('EReviewEventHandler', dirname(__FILE__) . '/e_review_eh.php', 'n-rev_EventHandler');
+//			$this->Application->registerClass('EReviewEventHandler', dirname(__FILE__) . '/reviews/e_review_eh.php', 'n-rev_EventHandler');
 		}
 
 		/**
Index: branches/1.1.x/units/sections/sections_config.php
===================================================================
diff -u -N -r14036 -r14239
--- branches/1.1.x/units/sections/sections_config.php	(.../sections_config.php)	(revision 14036)
+++ branches/1.1.x/units/sections/sections_config.php	(.../sections_config.php)	(revision 14239)
@@ -25,24 +25,24 @@
 		'RegisterClasses' => Array (
 
 			# extend default User core/units/users/users_tag_processor.php / users_event_handler.php
-//			Array ('pseudo' => 'u_TagProcessor', 'class' => 'EUserTagProcessor', 'file' => 'e_user_tp.php'),
-//			Array ('pseudo' => 'u_EventHandler', 'class' => 'EUserEventHandler', 'file' => 'e_user_eh.php'),
+//			Array ('pseudo' => 'u_TagProcessor', 'class' => 'EUserTagProcessor', 'file' => 'users/e_user_tp.php'),
+//			Array ('pseudo' => 'u_EventHandler', 'class' => 'EUserEventHandler', 'file' => 'users/e_user_eh.php'),
 
 			# extend default Product classes /in-commerce/units/products/products_tag_processor.php / products_event_handler.php
-//			Array ('pseudo' => 'p_TagProcessor', 'class' => 'EProductTagProcessor', 'file' => 'e_product_tp.php'),
-//			Array ('pseudo' => 'p_EventHandler', 'class' => 'EProductEventHandler', 'file' => 'e_product_eh.php'),
+//			Array ('pseudo' => 'p_TagProcessor', 'class' => 'EProductTagProcessor', 'file' => 'products/e_product_tp.php'),
+//			Array ('pseudo' => 'p_EventHandler', 'class' => 'EProductEventHandler', 'file' => 'products/e_product_eh.php'),
 
 			# extend default Link /in-link/units/links/link_tag_processor.php / links_event_handler.php
-//			Array ('pseudo' => 'l_TagProcessor', 'class' => 'ELinkTagProcessor', 'file' => 'e_link_tp.php'),
-//			Array ('pseudo' => 'l_EventHandler', 'class' => 'ELinkEventHandler', 'file' => 'e_link_eh.php'),
+//			Array ('pseudo' => 'l_TagProcessor', 'class' => 'ELinkTagProcessor', 'file' => 'links/e_link_tp.php'),
+//			Array ('pseudo' => 'l_EventHandler', 'class' => 'ELinkEventHandler', 'file' => 'links/e_link_eh.php'),
 
 			# extend default Category /core/units/categories/categories_tag_processor.php / categories_event_handler.php
-//			Array ('pseudo' => 'c_TagProcessor', 'class' => 'ECategoryTagProcessor', 'file' => 'e_category_tp.php'),
-//			Array ('pseudo' => 'c_EventHandler', 'class' => 'ECategoryEventHandler', 'file' => 'e_category_eh.php'),
+//			Array ('pseudo' => 'c_TagProcessor', 'class' => 'ECategoryTagProcessor', 'file' => 'categories/e_category_tp.php'),
+//			Array ('pseudo' => 'c_EventHandler', 'class' => 'ECategoryEventHandler', 'file' => 'categories/e_category_eh.php'),
 
 			# extend default Article /in-news/units/articles/article_tag_processor.php / articles_event_handler.php
-//			Array ('pseudo' => 'n_TagProcessor', 'class' => 'EArticleTagProcessor', 'file' => 'e_article_tp.php'),
-//			Array ('pseudo' => 'n_EventHandler', 'class' => 'EArticleEventHandler', 'file' => 'e_article_eh.php'),
+//			Array ('pseudo' => 'n_TagProcessor', 'class' => 'EArticleTagProcessor', 'file' => 'articles/e_article_tp.php'),
+//			Array ('pseudo' => 'n_EventHandler', 'class' => 'EArticleEventHandler', 'file' => 'articles/e_article_eh.php'),
 
 		),
 
Index: branches/1.1.x/units/sections/e_user_tp.php
===================================================================
diff -u -N
--- branches/1.1.x/units/sections/e_user_tp.php	(revision 13093)
+++ branches/1.1.x/units/sections/e_user_tp.php	(revision 0)
@@ -1,37 +0,0 @@
-<?php
-
-	defined('FULL_PATH') or die('restricted access!');
-
-	/**
-	 * Extends default UsersTagProcessor class
-	 *
-	 */
-	class EUserTagProcessor extends UsersTagProcessor  {
-
-		/**
-		 * Returns formated user address
-		 *
-		 * @param Array
-		 * @return string
-		 */
-		function PrintFormattedUserAddress($params)
-		{
-			$object =& $this->getObject($params);
-			/* @var $object kDBItem */
-
-			$ret = '';
-			$newline = '<br/>';
-
-			if ($object->isLoaded()) {
-				$ret = $object->GetField('Street') ? $object->GetField('Street') . $newline : '';
-				$ret .= $object->GetField('Street2') ? $object->GetField('Street2') . $newline : '';
-				$ret .= $object->GetField('City') ? $object->GetField('City') . ', ' : '';
-				$ret .= $object->GetField('State') ? $object->GetField('State') . ' ' : '';
-				$ret .= $object->GetField('Zip') ? $object->GetField('Zip') . $newline : '';
-				$ret .= $object->GetField('Country');
-			}
-
-			return $ret;
-		}
-
-	}
\ No newline at end of file
Index: branches/1.1.x/units/sections/e_product_tp.php
===================================================================
diff -u -N
--- branches/1.1.x/units/sections/e_product_tp.php	(revision 13093)
+++ branches/1.1.x/units/sections/e_product_tp.php	(revision 0)
@@ -1,28 +0,0 @@
-<?php
-
-	defined('FULL_PATH') or die('restricted access!');
-
-	/**
-	 * Extends/overrides methods of default ProductsTagProcessor class
-	 *
-	 */
-	class EProductTagProcessor extends ProductsTagProcessor {
-
-		/**
-		 * Adding custom processing to existing Field method
-		 *
-		 * @param Array $params
-		 * @return string
-		 */
-		function FormattedField($params)
-		{
-			// get from parent
-			$o = parent::Field($params);
-
-			// do some custom stuff here
-			$o = trim($o);
-
-			return $o;
-		}
-
-	}
\ No newline at end of file
Index: branches/1.1.x/units/sections/e_article_eh.php
===================================================================
diff -u -N
--- branches/1.1.x/units/sections/e_article_eh.php	(revision 13093)
+++ branches/1.1.x/units/sections/e_article_eh.php	(revision 0)
@@ -1,188 +0,0 @@
-<?php
-
-	defined('FULL_PATH') or die('restricted access!');
-
-	/**
-	 * Extends default ArticlesEventHandler class
-	 *
-	 */
-	class EArticleEventHandler extends ArticlesEventHandler {
-
-		/**
-		 * Allows to override standard permission mapping
-		 *
-		 */
-		function mapPermissions()
-		{
-			parent::mapPermissions();
-
-			$permissions = Array (
-				# admin
-				'OnCustomEvent1' => Array ('self' => true),
-
-				# front
-				'OnCustomEvent2' => Array ('self' => true),
-			);
-
-			$this->permMapping = array_merge($this->permMapping, $permissions);
-		}
-
-		/**
-		 * Permission exceptions
-		 *
-		 * @param kEvent $event
-		 */
-		function CheckPermission(&$event)
-		{
-			$skip_permissions_check_events = Array (
-				'OnAnotherCustomEvent',
-			);
-
-			if ( in_array($event->Name, $skip_permissions_check_events) ) {
-				return true;
-			}
-
-			return parent::CheckPermission($event);
-		}
-
-		/**
-		 * Updates structure config
-		 *
-		 * @param kEvent $event
-		 */
-		function OnAfterConfigRead(&$event)
-		{
-			parent::OnAfterConfigRead($event);
-
-			# 1. Regular Fields from /in-news/units/articles/articles_config.php
-			$fields = $this->Application->getUnitOption($event->Prefix, 'Fields'); #get regular fields
-//			$fields['Status']['default'] = STATUS_ACTIVE; #add/edit configuration (make default = STATUS_ACTIVE)
-			$this->Application->setUnitOption($event->Prefix, 'Fields', $fields); #save fields
-
-			# 2. Virtual Fields from /in-news/units/articles/articles_config.php
-			$virtual_fields = $this->Application->getUnitOption($event->Prefix, 'VirtualFields'); #get virtual fields
-//			$virtual_fields['UserName']['default'] = ''; #add/edit configuration
-			$this->Application->setUnitOption($event->Prefix, 'VirtualFields', $virtual_fields); #save virtual fields
-		}
-
-		/**
-		 * Sets custom query for the list
-		 *
-		 * @param kEvent $event
-		 */
-		function SetCustomQuery(&$event)
-		{
-			parent::SetCustomQuery($event);
-
-			$object =& $event->getObject();
-			/* @var $object kDBList */
-
-			# identifying event based on special and setting filter
-			if ($event->Special == 'custom-special') {
-//				$object->addFilter('primary_filter', '%1$s.Status = ' . STATUS_DISABLED);
-			}
-
-			# identifying event based not admin condition and setting filter
-			if (!$this->Application->isAdminUser) {
-//				$object->addFilter('status_filter', '%1$s.Status = ' . STATUS_ACTIVE);
-			}
-		}
-
-		/**
-		 * Before new item created
-		 *
-		 * @param kEvent $event
-		 */
-		function OnBeforeItemCreate(&$event)
-		{
-			parent::OnBeforeItemCreate($event);
-
-
-		}
-
-		/**
-		 * Before existing item updated
-		 *
-		 * @param kEvent $event
-		 */
-		function OnBeforeItemUpdate(&$event)
-		{
-			parent::OnBeforeItemUpdate($event);
-
-
-		}
-
-		/**
-		 * Before item deleted
-		 *
-		 * @param kEvent $event
-		 */
-		function OnBeforeItemDelete(&$event)
-		{
-			parent::OnBeforeItemDelete($event);
-
-
-		}
-
-		/**
-		 * After item loaded
-		 *
-		 * @param kEvent $event
-		 */
-		function OnBeforeItemLoad(&$event)
-		{
-			parent::OnBeforeItemLoad($event);
-
-
-		}
-
-
-		/**
-		 * After new item created
-		 *
-		 * @param kEvent $event
-		 */
-		function OnAfterItemCreate(&$event)
-		{
-			parent::OnAfterItemCreate($event);
-
-
-		}
-
-		/**
-		 * After existing item updated
-		 *
-		 * @param kEvent $event
-		 */
-		function OnAfterItemUpdate(&$event)
-		{
-			parent::OnAfterItemUpdate($event);
-
-
-		}
-
-		/**
-		 * After item deleted
-		 *
-		 * @param kEvent $event
-		 */
-		function OnAfterItemDelete(&$event)
-		{
-			parent::OnAfterItemDelete($event);
-
-
-		}
-
-		/**
-		 * After item loaded
-		 *
-		 * @param kEvent $event
-		 */
-		function OnAfterItemLoad(&$event)
-		{
-			parent::OnAfterItemLoad($event);
-
-
-		}
-
-	}
Index: branches/1.1.x/units/sections/e_user_eh.php
===================================================================
diff -u -N
--- branches/1.1.x/units/sections/e_user_eh.php	(revision 13093)
+++ branches/1.1.x/units/sections/e_user_eh.php	(revision 0)
@@ -1,188 +0,0 @@
-<?php
-
-	defined('FULL_PATH') or die('restricted access!');
-
-	/**
-	 * Extends default UsersEventHandler class
-	 *
-	 */
-	class EUserEventHandler extends UsersEventHandler {
-
-		/**
-		 * Allows to override standard permission mapping
-		 *
-		 */
-		function mapPermissions()
-		{
-			parent::mapPermissions();
-
-			$permissions = Array (
-				# admin
-				'OnCustomEvent1' =>	Array ('self' => true),
-
-				# front
-				'OnCustomEvent2' => Array ('self' => true),
-			);
-
-			$this->permMapping = array_merge($this->permMapping, $permissions);
-		}
-
-		/**
-		 * Permission exceptions
-		 *
-		 * @param kEvent $event
-		 */
-		function CheckPermission(&$event)
-		{
-			$skip_permissions_check_events = Array (
-				'OnAnotherCustomEvent',
-			);
-
-			if ( in_array($event->Name, $skip_permissions_check_events) ) {
-				return true;
-			}
-
-			return parent::CheckPermission($event);
-		}
-
-		/**
-		 * Updates structure config
-		 *
-		 * @param kEvent $event
-		 */
-		function OnAfterConfigRead(&$event)
-		{
-			parent::OnAfterConfigRead($event);
-
-			# 1. Regular Fields from /core/units/users/users_config.php
-			$fields = $this->Application->getUnitOption($event->Prefix, 'Fields'); #get regular fields
-//			$fields['Status']['default'] = 1; #add/edit configuration (make default = 1)
-			$this->Application->setUnitOption($event->Prefix, 'Fields', $fields); #save regular fields
-
-			# 2. Virtual Fields from /core/units/users/users_config.php
-			$virtual_fields = $this->Application->getUnitOption($event->Prefix, 'VirtualFields'); #get virtual fields
-//			$virtual_fields['FullName']['default'] = ''; #add/edit configuration
-			$this->Application->setUnitOption($event->Prefix, 'VirtualFields', $virtual_fields); #save virtual fields
-		}
-
-		/**
-		 * Sets custom query for the list
-		 *
-		 * @param kEvent $event
-		 */
-		function SetCustomQuery(&$event)
-		{
-			parent::SetCustomQuery($event);
-
-			$object =& $event->getObject();
-			/* @var $object kDBList */
-
-			# identifying event based on special and setting filter
-			if ( $event->Special == 'custom-special' ) {
-//				$object->addFilter('primary_filter', '%1$s.Status = ' . STATUS_DISABLED);
-			}
-
-			# identifying event based not admin condition and setting filter
-			if (!$this->Application->isAdminUser) {
-//				$object->addFilter('status_filter', '%1$s.Status = ' . STATUS_ACTIVE);
-			}
-		}
-
-		/**
-		 * Before new item created
-		 *
-		 * @param kEvent $event
-		 */
-		function OnBeforeItemCreate(&$event)
-		{
-			parent::OnBeforeItemCreate($event);
-
-
-		}
-
-		/**
-		 * Before existing item updated
-		 *
-		 * @param kEvent $event
-		 */
-		function OnBeforeItemUpdate(&$event)
-		{
-			parent::OnBeforeItemUpdate($event);
-
-
-		}
-
-		/**
-		 * Before item deleted
-		 *
-		 * @param kEvent $event
-		 */
-		function OnBeforeItemDelete(&$event)
-		{
-			parent::OnBeforeItemDelete($event);
-
-
-		}
-
-		/**
-		 * After item loaded
-		 *
-		 * @param kEvent $event
-		 */
-		function OnBeforeItemLoad(&$event)
-		{
-			parent::OnBeforeItemLoad($event);
-
-
-		}
-
-
-		/**
-		 * After new item created
-		 *
-		 * @param kEvent $event
-		 */
-		function OnAfterItemCreate(&$event)
-		{
-			parent::OnAfterItemCreate($event);
-
-
-		}
-
-		/**
-		 * After existing item updated
-		 *
-		 * @param kEvent $event
-		 */
-		function OnAfterItemUpdate(&$event)
-		{
-			parent::OnAfterItemUpdate($event);
-
-
-		}
-
-		/**
-		 * After item deleted
-		 *
-		 * @param kEvent $event
-		 */
-		function OnAfterItemDelete(&$event)
-		{
-			parent::OnAfterItemDelete($event);
-
-
-		}
-
-		/**
-		 * After item loaded
-		 *
-		 * @param kEvent $event
-		 */
-		function OnAfterItemLoad(&$event)
-		{
-			parent::OnAfterItemLoad($event);
-
-
-		}
-
-	}
\ No newline at end of file
Index: branches/1.1.x/units/sections/e_product_eh.php
===================================================================
diff -u -N
--- branches/1.1.x/units/sections/e_product_eh.php	(revision 13093)
+++ branches/1.1.x/units/sections/e_product_eh.php	(revision 0)
@@ -1,189 +0,0 @@
-<?php
-
-	defined('FULL_PATH') or die('restricted access!');
-
-	/**
-	 * Extends/overrides methods of default ProductsEventHandler class
-	 *
-	 */
-	class EProductEventHandler extends ProductsEventHandler {
-
-		/**
-		 * Allows to override standard permission mapping
-		 *
-		 */
-		function mapPermissions()
-		{
-			parent::mapPermissions();
-
-			$permissions = Array (
-				# admin
-				'OnCustomEvent1' => Array ('self' => true),
-
-				# front
-				'OnCustomEvent2' => Array ('self' => true),
-			);
-
-			$this->permMapping = array_merge($this->permMapping, $permissions);
-		}
-
-		/**
-		 * Permission exceptions
-		 *
-		 * @param kEvent $event
-		 */
-		function CheckPermission(&$event)
-		{
-			$skip_permissions_check_events = Array (
-				'OnAnotherCustomEvent',
-			);
-
-			if ( in_array($event->Name, $skip_permissions_check_events) ) {
-				return true;
-			}
-
-			return parent::CheckPermission($event);
-		}
-
-		/**
-		 * Updates structure config
-		 *
-		 * @param kEvent $event
-		 */
-		function OnAfterConfigRead(&$event)
-		{
-			parent::OnAfterConfigRead($event);
-
-			# 1. Regular Fields from /in-commerce/units/products/products_config.php
-			$fields = $this->Application->getUnitOption($event->Prefix, 'Fields'); #get regular fields
-//			$fields['Status']['default'] = STATUS_ACTIVE; #add/edit field configuration (make default = STATUS_ACTIVE)
-			$this->Application->setUnitOption($event->Prefix, 'Fields', $fields); #save regular fields
-
-
-			# 2. Virtual Fields from /in-commerce/units/products/products_config.php
-			$virtual_fields = $this->Application->getUnitOption($event->Prefix, 'VirtualFields'); #get virtual fields
-//			$virtual_fields['Qty']['default'] = 1; #add/edit field configuration
-			$this->Application->setUnitOption($event->Prefix, 'VirtualFields', $virtual_fields); # save virtual fields
-		}
-
-		/**
-		 * Sets custom query for the list
-		 *
-		 * @param kEvent $event
-		 */
-		function SetCustomQuery(&$event)
-		{
-			parent::SetCustomQuery($event);
-
-			$object =& $event->getObject();
-			/* @var $object kDBList */
-
-			# identifying event based on special and setting filter
-			if ( $event->Special == 'custom-special' ) {
-//				$object->addFilter('primary_filter', '%1$s.Status = '.STATUS_DISABLED);
-			}
-
-			# identifying event based not admin condition and setting filter
-			if (!$this->Application->isAdminUser) {
-//				$object->addFilter('status_filter', '%1$s.Status = '.STATUS_ACTIVE);
-			}
-		}
-
-		/**
-		 * Before new item created
-		 *
-		 * @param kEvent $event
-		 */
-		function OnBeforeItemCreate(&$event)
-		{
-			parent::OnBeforeItemCreate($event);
-
-
-		}
-
-		/**
-		 * Before existing item updated
-		 *
-		 * @param kEvent $event
-		 */
-		function OnBeforeItemUpdate(&$event)
-		{
-			parent::OnBeforeItemUpdate($event);
-
-
-		}
-
-		/**
-		 * Before item deleted
-		 *
-		 * @param kEvent $event
-		 */
-		function OnBeforeItemDelete(&$event)
-		{
-			parent::OnBeforeItemDelete($event);
-
-
-		}
-
-		/**
-		 * After item loaded
-		 *
-		 * @param kEvent $event
-		 */
-		function OnBeforeItemLoad(&$event)
-		{
-			parent::OnBeforeItemLoad($event);
-
-
-		}
-
-
-		/**
-		 * After new item created
-		 *
-		 * @param kEvent $event
-		 */
-		function OnAfterItemCreate(&$event)
-		{
-			parent::OnAfterItemCreate($event);
-
-
-		}
-
-		/**
-		 * After existing item updated
-		 *
-		 * @param kEvent $event
-		 */
-		function OnAfterItemUpdate(&$event)
-		{
-			parent::OnAfterItemUpdate($event);
-
-
-		}
-
-		/**
-		 * After item deleted
-		 *
-		 * @param kEvent $event
-		 */
-		function OnAfterItemDelete(&$event)
-		{
-			parent::OnAfterItemDelete($event);
-
-
-		}
-
-		/**
-		 * After item loaded
-		 *
-		 * @param kEvent $event
-		 */
-		function OnAfterItemLoad(&$event)
-		{
-			parent::OnAfterItemLoad($event);
-
-
-		}
-
-	}
\ No newline at end of file
Index: branches/1.1.x/units/sections/e_category_tp.php
===================================================================
diff -u -N
--- branches/1.1.x/units/sections/e_category_tp.php	(revision 13093)
+++ branches/1.1.x/units/sections/e_category_tp.php	(revision 0)
@@ -1,28 +0,0 @@
-<?php
-
-	defined('FULL_PATH') or die('restricted access!');
-
-	/**
-	 * Extends default CategoriesTagProcessor class
-	 *
-	 */
-	class ECategoryTagProcessor extends CategoriesTagProcessor {
-
-		/**
-		 * Adding custom processing to existing Field method
-		 *
-		 * @param Array $params
-		 * @return string
-		 */
-		function FormattedField($params)
-		{
-			// get from parent
-			$o = parent::Field($params);
-
-			// do some custom stuff here
-			$o = trim($o);
-
-			return $o;
-		}
-		
-	}
Index: branches/1.1.x/units/sections/e_link_tp.php
===================================================================
diff -u -N
--- branches/1.1.x/units/sections/e_link_tp.php	(revision 13093)
+++ branches/1.1.x/units/sections/e_link_tp.php	(revision 0)
@@ -1,28 +0,0 @@
-<?php
-
-	defined('FULL_PATH') or die('restricted access!');
-
-	/**
-	 * Extends default LinkTagProcessor class
-	 *
-	 */
-	class ELinkTagProcessor extends LinkTagProcessor {
-
-		/**
-		 * Adding custom processing to existing Field method
-		 *
-		 * @param Array $params
-		 * @return string
-		 */
-		function FormattedField($params)
-		{
-			// get from parent
-			$o = parent::Field($params);
-
-			// do some custom stuff here
-			$o = trim($o);
-
-			return $o;
-		}
-		
-	}
\ No newline at end of file
Index: branches/1.1.x/units/sections/e_category_eh.php
===================================================================
diff -u -N
--- branches/1.1.x/units/sections/e_category_eh.php	(revision 13093)
+++ branches/1.1.x/units/sections/e_category_eh.php	(revision 0)
@@ -1,188 +0,0 @@
-<?php
-
-	defined('FULL_PATH') or die('restricted access!');
-
-	/**
-	 * Extends default CategoriesEventHandler class
-	 *
-	 */
-	class ECategoryEventHandler extends CategoriesEventHandler {
-
-		/**
-		 * Allows to override standard permission mapping
-		 *
-		 */
-		function mapPermissions()
-		{
-			parent::mapPermissions();
-
-			$permissions = Array (
-				# admin
-				'OnCustomEvent1' => Array ('self' => true),
-
-				# front
-				'OnCustomEvent2' => Array ('self' => true),
-			);
-
-			$this->permMapping = array_merge($this->permMapping, $permissions);
-		}
-
-		/**
-		 * Permission exceptions
-		 *
-		 * @param kEvent $event
-		 */
-		function CheckPermission(&$event)
-		{
-			$skip_permissions_check_events = Array (
-				'OnAnotherCustomEvent',
-			);
-
-			if ( in_array($event->Name, $skip_permissions_check_events) ) {
-				return true;
-			}
-
-			return parent::CheckPermission($event);
-		}
-
-		/**
-		 * Updates structure config
-		 *
-		 * @param kEvent $event
-		 */
-		function OnAfterConfigRead(&$event)
-		{
-			parent::OnAfterConfigRead($event);
-
-			# 1. Regular Fields from /core/units/categories/categories_config.php
-			$fields = $this->Application->getUnitOption($event->Prefix, 'Fields'); #get regular fields
-//			$fields['Status']['default'] = STATUS_ACTIVE; #add/edit configuration (make default = STATUS_ACTIVE)
-			$this->Application->setUnitOption($event->Prefix, 'Fields', $fields); #save fields
-
-			# 2. Virtual Fields from /core/units/categories/categories_config.php
-			$virtual_fields = $this->Application->getUnitOption($event->Prefix, 'VirtualFields'); #get virtual fields
-//			$virtual_fields['UserName']['default'] = ''; #add/edit configuration
-			$this->Application->setUnitOption($event->Prefix, 'VirtualFields', $virtual_fields); #save virtual fields
-		}
-
-		/**
-		 * Sets custom query for the list
-		 *
-		 * @param kEvent $event
-		 */
-		function SetCustomQuery(&$event)
-		{
-			parent::SetCustomQuery($event);
-
-			$object =& $event->getObject();
-			/* @var $object kDBList */
-
-			# identifying event based on special and setting filter
-			if ($event->Special == 'custom-special') {
-//				$object->addFilter('primary_filter', '%1$s.Status = ' . STATUS_DISABLED);
-			}
-
-			# identifying event based not admin condition and setting filter
-			if (!$this->Application->isAdminUser) {
-//				$object->addFilter('status_filter', '%1$s.Status = ' . STATUS_ACTIVE);
-			}
-		}
-
-		/**
-		 * Before new item created
-		 *
-		 * @param kEvent $event
-		 */
-		function OnBeforeItemCreate(&$event)
-		{
-			parent::OnBeforeItemCreate($event);
-
-
-		}
-
-		/**
-		 * Before existing item updated
-		 *
-		 * @param kEvent $event
-		 */
-		function OnBeforeItemUpdate(&$event)
-		{
-			parent::OnBeforeItemUpdate($event);
-
-
-		}
-
-		/**
-		 * Before item deleted
-		 *
-		 * @param kEvent $event
-		 */
-		function OnBeforeItemDelete(&$event)
-		{
-			parent::OnBeforeItemDelete($event);
-
-
-		}
-
-		/**
-		 * After item loaded
-		 *
-		 * @param kEvent $event
-		 */
-		function OnBeforeItemLoad(&$event)
-		{
-			parent::OnBeforeItemLoad($event);
-
-
-		}
-
-
-		/**
-		 * After new item created
-		 *
-		 * @param kEvent $event
-		 */
-		function OnAfterItemCreate(&$event)
-		{
-			parent::OnAfterItemCreate($event);
-
-
-		}
-
-		/**
-		 * After existing item updated
-		 *
-		 * @param kEvent $event
-		 */
-		function OnAfterItemUpdate(&$event)
-		{
-			parent::OnAfterItemUpdate($event);
-
-
-		}
-
-		/**
-		 * After item deleted
-		 *
-		 * @param kEvent $event
-		 */
-		function OnAfterItemDelete(&$event)
-		{
-			parent::OnAfterItemDelete($event);
-
-
-		}
-
-		/**
-		 * After item loaded
-		 *
-		 * @param kEvent $event
-		 */
-		function OnAfterItemLoad(&$event)
-		{
-			parent::OnAfterItemLoad($event);
-
-
-		}
-
-	}