diff --git a/src/main/java/com/jwebmp/core/Event.java b/src/main/java/com/jwebmp/core/Event.java
index bdb43b66..fb61e9ff 100644
--- a/src/main/java/com/jwebmp/core/Event.java
+++ b/src/main/java/com/jwebmp/core/Event.java
@@ -29,6 +29,7 @@
 import com.jwebmp.core.base.servlets.enumarations.ComponentTypes;
 import com.jwebmp.core.events.IEventConfigurator;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
+import com.jwebmp.core.htmlbuilder.javascript.events.interfaces.IEvent;
 import jakarta.validation.constraints.NotNull;
 
 import java.util.ArrayList;
@@ -41,279 +42,259 @@
 /**
  * Container Class for Events. Splits from the component hierarchy
  *
- * @param <J>
- * 		This class
- *
+ * @param <J> This class
  * @author GedMarc
  * @since 23 Apr 2016
  */
 @SuppressWarnings("unused")
 public abstract class Event<F extends GlobalFeatures, J extends Event<F, J>>
-		extends ComponentEventBase<F, GlobalEvents, J>
-		implements GlobalEvents<J>
+        extends ComponentEventBase<F, GlobalEvents, J>
+        implements GlobalEvents<J>, IEvent<F, J>
 {
-	/**
-	 * A list of all queries to execute on ajax response
-	 */
-	@JsonInclude(JsonInclude.Include.NON_EMPTY)
-	private List<Event<?,?>> runEvents;
-	/**
-	 * Any features that must be run
-	 */
-	@JsonInclude(JsonInclude.Include.NON_EMPTY)
-	private List<Feature<?,?,?>> runFeatures;
+    /**
+     * A list of all queries to execute on ajax response
+     */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private List<Event<?, ?>> runEvents;
+    /**
+     * Any features that must be run
+     */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private List<Feature<?, ?, ?>> runFeatures;
+
+    /**
+     * Constructs an event with the given name
+     *
+     * @param name The name of the event
+     */
+    public Event(String name)
+    {
+        this(name, EventTypes.undefined);
+    }
+
+    /**
+     * Constructs an event with the given name
+     *
+     * @param name      The name of the event
+     * @param eventType The event type of this event
+     */
+    public Event(String name, EventTypes eventType)
+    {
+        this(name, eventType, null);
+    }
 
-	/**
-	 * Constructs an event with the given name
-	 *
-	 * @param name
-	 * 		The name of the event
-	 */
-	public Event(String name)
-	{
-		this(name, EventTypes.undefined);
-	}
+    /**
+     * Constructs an event with the given name
+     *
+     * @param name      The name of this event
+     * @param eventType The event type of this event
+     * @param component The component type of this event
+     */
+    @SuppressWarnings("unchecked")
+    public Event(String name, EventTypes eventType, IComponentHierarchyBase<?, ?> component)
+    {
+        super(ComponentTypes.Event);
+        setID(getClassCanonicalName());
+        setName(name);
+        setComponent(component);
+        setEventType(eventType);
 
-	/**
-	 * Constructs an event with the given name
-	 *
-	 * @param name
-	 * 		The name of the event
-	 * @param eventType
-	 * 		The event type of this event
-	 */
-	public Event(String name, EventTypes eventType)
-	{
-		this(name, eventType, null);
-	}
+        @SuppressWarnings("rawtypes")
+        Set<IEventConfigurator> eventConfiguratorSet = IGuiceContext
+                .instance()
+                .getLoader(IEventConfigurator.class, ServiceLoader.load(IEventConfigurator.class));
 
-	/**
-	 * Constructs an event with the given name
-	 *
-	 * @param name
-	 * 		The name of this event
-	 * @param eventType
-	 * 		The event type of this event
-	 * @param component
-	 * 		The component type of this event
-	 */
-	@SuppressWarnings("unchecked")
-	public Event(String name, EventTypes eventType, IComponentHierarchyBase<?,?> component)
-	{
-		super(ComponentTypes.Event);
-		setID(getClassCanonicalName());
-		setName(name);
-		setComponent(component);
-		setEventType(eventType);
+        for (IEventConfigurator<?> iEventConfigurator : eventConfiguratorSet)
+        {
+            iEventConfigurator.configureEvent(this);
+        }
+    }
 
-		@SuppressWarnings("rawtypes")
-		Set<IEventConfigurator> eventConfiguratorSet = IGuiceContext
-				                                               .instance()
-				                                               .getLoader(IEventConfigurator.class, ServiceLoader.load(IEventConfigurator.class));
-		
-		for (IEventConfigurator<?> iEventConfigurator : eventConfiguratorSet)
-		{
-			iEventConfigurator.configureEvent(this);
-		}
-	}
-	
-	/**
-	 * Adds a variable to return on the call
-	 *
-	 * @param returnVariable
-	 * 		The name of the variable to return
-	 *
-	 * @return This object
-	 */
-	@SuppressWarnings("unchecked")
-	public J returnVariable(String returnVariable)
-	{
-		getVariables().add(returnVariable);
-		return (J) this;
-	}
+    /**
+     * Adds a variable to return on the call
+     *
+     * @param returnVariable The name of the variable to return
+     * @return This object
+     */
+    @SuppressWarnings("unchecked")
+    public J returnVariable(String returnVariable)
+    {
+        getVariables().add(returnVariable);
+        return (J) this;
+    }
 
-	/**
-	 * Constructs an event with the given name
-	 *
-	 * @param name
-	 * 		The name of this event
-	 * @param component
-	 * 		The component type of this event
-	 */
-	public Event(String name, IComponentHierarchyBase<?,?> component)
-	{
-		this(name, EventTypes.undefined, component);
-	}
+    /**
+     * Constructs an event with the given name
+     *
+     * @param name      The name of this event
+     * @param component The component type of this event
+     */
+    public Event(String name, IComponentHierarchyBase<?, ?> component)
+    {
+        this(name, EventTypes.undefined, component);
+    }
 
-	/**
-	 * Creates an event with the given component and type
-	 *
-	 * @param component The component to use bind to
-	 */
-	public Event(IComponentHierarchyBase<?,?> component)
-	{
-		this(EventTypes.undefined, component);
-	}
+    /**
+     * Creates an event with the given component and type
+     *
+     * @param component The component to use bind to
+     */
+    public Event(IComponentHierarchyBase<?, ?> component)
+    {
+        this(EventTypes.undefined, component);
+    }
 
-	/**
-	 * Creates an event with the given component and type
-	 *
-	 * @param eventTypes This event type
-	 * @param component The component to bind to
-	 */
-	public Event(EventTypes eventTypes, IComponentHierarchyBase<?,?> component)
-	{
-		this(eventTypes.name(), eventTypes, component);
-	}
+    /**
+     * Creates an event with the given component and type
+     *
+     * @param eventTypes This event type
+     * @param component  The component to bind to
+     */
+    public Event(EventTypes eventTypes, IComponentHierarchyBase<?, ?> component)
+    {
+        this(eventTypes.name(), eventTypes, component);
+    }
 
-	/**
-	 * Render the variable return array
-	 *
-	 * @return The variables rendered string
-	 */
-	public StringBuilder renderVariables()
-	{
-		StringBuilder s = new StringBuilder(StaticStrings.STRING_SQUARE_BRACE_OPEN);
-		getVariables().forEach(event -> s.append(STRING_SINGLE_QUOTES)
-		                                 .append(event)
-		                                 .append(STRING_SINGLE_QUOTES)
-		                                 .append(StaticStrings.STRING_COMMNA));
-		StringBuilder s2;
-		if (s.indexOf(StaticStrings.STRING_COMMNA) > 0)
-		{
-			s2 = s.deleteCharAt(s.lastIndexOf(StaticStrings.STRING_COMMNA));
-		}
-		else
-		{
-			s2 = s;
-		}
-		s2.append(STRING_SQUARE_BRACE_CLOSED);
-		s2.append(STRING_COMMNA_SEMICOLON)
-		  .append(getID())
-		  .append(STRING_SINGLE_QUOTES);
-		s2.append(STRING_COMMNA_SEMICOLON)
-		  .append(getClassCanonicalName())
-		  .append(STRING_SINGLE_QUOTES);
+    /**
+     * Render the variable return array
+     *
+     * @return The variables rendered string
+     */
+    public StringBuilder renderVariables()
+    {
+        StringBuilder s = new StringBuilder(StaticStrings.STRING_SQUARE_BRACE_OPEN);
+        getVariables().forEach(event -> s.append(STRING_SINGLE_QUOTES)
+                                         .append(event)
+                                         .append(STRING_SINGLE_QUOTES)
+                                         .append(StaticStrings.STRING_COMMNA));
+        StringBuilder s2;
+        if (s.indexOf(StaticStrings.STRING_COMMNA) > 0)
+        {
+            s2 = s.deleteCharAt(s.lastIndexOf(StaticStrings.STRING_COMMNA));
+        }
+        else
+        {
+            s2 = s;
+        }
+        s2.append(STRING_SQUARE_BRACE_CLOSED);
+        s2.append(STRING_COMMNA_SEMICOLON)
+          .append(getID())
+          .append(STRING_SINGLE_QUOTES);
+        s2.append(STRING_COMMNA_SEMICOLON)
+          .append(getClassCanonicalName())
+          .append(STRING_SINGLE_QUOTES);
 
-		return s2;
-	}
+        return s2;
+    }
 
-	/**
-	 * The method that is fired on call
-	 *
-	 * @param call
-	 * 		The component that made the call
-	 * @param response
-	 * 		The Response Object Being Returned
-	 */
-	public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
-	{
+    /**
+     * The method that is fired on call
+     *
+     * @param call     The component that made the call
+     * @param response The Response Object Being Returned
+     */
+    public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
+    {
 
-	}
+    }
 
-	/**
-	 * Adds an on demand event to be performed after ajax response
-	 *
-	 * @param event An on demand event (client side only)
-	 *
-	 * @return  This object
-	 */
-	@SuppressWarnings("unchecked")
-	public J addOnDemandEvent(Event<?,?> event)
-	{
-		getRunEvents().add(event);
-		return (J) this;
-	}
+    /**
+     * Adds an on demand event to be performed after ajax response
+     *
+     * @param event An on demand event (client side only)
+     * @return This object
+     */
+    @SuppressWarnings("unchecked")
+    public J addOnDemandEvent(Event<?, ?> event)
+    {
+        getRunEvents().add(event);
+        return (J) this;
+    }
 
-	/**
-	 * Return all the queries to execute on ajax response
-	 *
-	 * @return The list of events to run
-	 */
-	public List<Event<?,?>> getRunEvents()
-	{
-		if (runEvents == null)
-		{
-			runEvents = new ArrayList<>();
-		}
-		return runEvents;
-	}
+    /**
+     * Return all the queries to execute on ajax response
+     *
+     * @return The list of events to run
+     */
+    public List<Event<?, ?>> getRunEvents()
+    {
+        if (runEvents == null)
+        {
+            runEvents = new ArrayList<>();
+        }
+        return runEvents;
+    }
 
-	/**
-	 * Returns all queries that are executed on ajax response
-	 *
-	 * @param onDemandQueries The list of on demand queries to execute
-	 *
-	 * @return  This object
-	 */
-	@SuppressWarnings("unchecked")
-	public J setOnDemandQueries(List<Event<?,?>> onDemandQueries)
-	{
-		runEvents = onDemandQueries;
-		return (J) this;
-	}
+    /**
+     * Returns all queries that are executed on ajax response
+     *
+     * @param onDemandQueries The list of on demand queries to execute
+     * @return This object
+     */
+    @SuppressWarnings("unchecked")
+    public J setOnDemandQueries(List<Event<?, ?>> onDemandQueries)
+    {
+        runEvents = onDemandQueries;
+        return (J) this;
+    }
 
-	/**
-	 * Method hashCode ...
-	 *
-	 * @return int
-	 */
-	@Override
-	public int hashCode()
-	{
-		return super.hashCode();
-	}
+    /**
+     * Method hashCode ...
+     *
+     * @return int
+     */
+    @Override
+    public int hashCode()
+    {
+        return super.hashCode();
+    }
 
-	/**
-	 * Method equals ...
-	 *
-	 * @param obj
-	 * 		of type Object
-	 *
-	 * @return boolean
-	 */
-	@Override
-	public boolean equals(Object obj)
-	{
-		return super.equals(obj);
-	}
+    /**
+     * Method equals ...
+     *
+     * @param obj of type Object
+     * @return boolean
+     */
+    @Override
+    public boolean equals(Object obj)
+    {
+        return super.equals(obj);
+    }
 
-	/**
-	 * Sets the ID as whatever with dots as underscores
-	 *
-	 * @param id
-	 * 		The ID
-	 *
-	 * @return  This object
-	 */
-	@NotNull
-	@Override
-	public J setID(String id)
-	{
-		return super.setID(id.replace(StaticStrings.CHAR_DOT, StaticStrings.CHAR_UNDERSCORE));
-	}
+    /**
+     * Sets the ID as whatever with dots as underscores
+     *
+     * @param id The ID
+     * @return This object
+     */
+    @NotNull
+    @Override
+    public J setID(String id)
+    {
+        return super.setID(id.replace(StaticStrings.CHAR_DOT, StaticStrings.CHAR_UNDERSCORE));
+    }
 
-	/**
-	 * Returns a list of runnable features that occur from an event
-	 *
-	 * @return The list of features to run that is associated with this event
-	 */
-	public List<Feature<?,?,?>> getRunFeatures()
-	{
-		if (runFeatures == null)
-		{
-			setRunFeatures(new ArrayList<>());
-		}
-		return runFeatures;
-	}
+    /**
+     * Returns a list of runnable features that occur from an event
+     *
+     * @return The list of features to run that is associated with this event
+     */
+    public List<Feature<?, ?, ?>> getRunFeatures()
+    {
+        if (runFeatures == null)
+        {
+            setRunFeatures(new ArrayList<>());
+        }
+        return runFeatures;
+    }
 
-	/**
-	 * Sets the running feature base
-	 *
-	 * @param runFeatures The list of features to run that is associated with this event
-	 */
-	public void setRunFeatures(List<Feature<?,?,?>> runFeatures)
-	{
-		this.runFeatures = runFeatures;
-	}
+    /**
+     * Sets the running feature base
+     *
+     * @param runFeatures The list of features to run that is associated with this event
+     */
+    public void setRunFeatures(List<Feature<?, ?, ?>> runFeatures)
+    {
+        this.runFeatures = runFeatures;
+    }
 }
diff --git a/src/main/java/com/jwebmp/core/Page.java b/src/main/java/com/jwebmp/core/Page.java
index 7aa00180..c75f2b47 100644
--- a/src/main/java/com/jwebmp/core/Page.java
+++ b/src/main/java/com/jwebmp/core/Page.java
@@ -649,7 +649,7 @@ private void addVariablesScriptToPage()
                                   .append(var)
                                   .append(STRING_SEMICOLON);
         }
-        if (variablesScriptBuilder.length() > 0)
+        if (!variablesScriptBuilder.isEmpty())
         {
             Script<?, ?> variablesScript = new Script<>();
             variablesScript.setID("variables");
diff --git a/src/main/java/com/jwebmp/core/databind/ClientVariableWatcher.java b/src/main/java/com/jwebmp/core/databind/ClientVariableWatcher.java
deleted file mode 100644
index 6c788f3d..00000000
--- a/src/main/java/com/jwebmp/core/databind/ClientVariableWatcher.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package com.jwebmp.core.databind;
-
-import com.jwebmp.core.Event;
-import com.jwebmp.core.events.change.ChangeAdapter;
-
-import jakarta.validation.constraints.NotNull;
-
-/**
- * A specification for notifications of client variable changes (on client data change)
- */
-public abstract class ClientVariableWatcher
-		implements IClientVariableWatcher
-{
-	/**
-	 * The name of the watcher (for replacement)
-	 */
-	private String watchName;
-	/**
-	 * The name of the variable in dot syntax variable.name
-	 */
-	private String variableName;
-	/**
-	 * The class that this event will fire on change
-	 */
-	private Class<? extends ChangeAdapter<?>> eventClass;
-
-	/**
-	 * Constructor ClientVariableWatcher creates a new ClientVariableWatcher instance.
-	 *
-	 * @param watchName
-	 * 		of type String
-	 * @param variableName
-	 * 		of type String
-	 * @param eventClass
-	 * 		of type Class ? extends ChangeAdapter
-	 */
-	public ClientVariableWatcher(@NotNull String watchName, @NotNull String variableName, @NotNull Class<? extends ChangeAdapter<?>> eventClass)
-	{
-		this.watchName = watchName;
-		this.variableName = variableName;
-		this.eventClass = eventClass;
-	}
-
-	/**
-	 * Method getVariableName returns the variableName of this ClientVariableWatcher object.
-	 * <p>
-	 * The name of the variable in dot syntax variable.name
-	 *
-	 * @return the variableName (type String) of this ClientVariableWatcher object.
-	 */
-	public String getVariableName()
-	{
-		return variableName;
-	}
-
-	/**
-	 * Method setVariableName sets the variableName of this ClientVariableWatcher object.
-	 * <p>
-	 * The name of the variable in dot syntax variable.name
-	 *
-	 * @param variableName
-	 * 		the variableName of this ClientVariableWatcher object.
-	 */
-	public void setVariableName(@NotNull String variableName)
-	{
-		this.variableName = variableName;
-	}
-
-	/**
-	 * Method getEventClass returns the eventClass of this ClientVariableWatcher object.
-	 * <p>
-	 * The class that this event will fire on change
-	 *
-	 * @return the eventClass (type Class ? extends Event ?, ? ) of this ClientVariableWatcher object.
-	 */
-	public Class<? extends Event<?, ?>> getEventClass()
-	{
-		return eventClass;
-	}
-
-	/**
-	 * Method setEventClass sets the eventClass of this ClientVariableWatcher object.
-	 * <p>
-	 * The class that this event will fire on change
-	 *
-	 * @param eventClass
-	 * 		the eventClass of this ClientVariableWatcher object.
-	 */
-	public void setEventClass(@NotNull Class<? extends ChangeAdapter<?>> eventClass)
-	{
-		this.eventClass = eventClass;
-	}
-
-	/**
-	 * Method hashCode ...
-	 *
-	 * @return int
-	 */
-	@Override
-	public int hashCode()
-	{
-		return getWatchName().hashCode();
-	}
-
-	/**
-	 * Method getWatchName returns the watchName of this ClientVariableWatcher object.
-	 * <p>
-	 * The name of the watcher (for replacement)
-	 *
-	 * @return the watchName (type String) of this ClientVariableWatcher object.
-	 */
-	public String getWatchName()
-	{
-		return watchName;
-	}
-
-	/**
-	 * Method setWatchName sets the watchName of this ClientVariableWatcher object.
-	 * <p>
-	 * The name of the watcher (for replacement)
-	 *
-	 * @param watchName
-	 * 		the watchName of this ClientVariableWatcher object.
-	 */
-	public void setWatchName(@NotNull String watchName)
-	{
-		this.watchName = watchName;
-	}
-
-	/**
-	 * Method equals ...
-	 *
-	 * @param o
-	 * 		of type Object
-	 *
-	 * @return boolean
-	 */
-	@Override
-	public boolean equals(Object o)
-	{
-		if (this == o)
-		{
-			return true;
-		}
-		if (o == null || getClass() != o.getClass())
-		{
-			return false;
-		}
-		ClientVariableWatcher that = (ClientVariableWatcher) o;
-		return getWatchName().equals(that.getWatchName());
-	}
-
-	/**
-	 * Returns the script to add the variable watcher
-	 *
-	 * @return The java script
-	 */
-	@Override
-	public String toString()
-	{
-		return this.onClientVariableRequest(watchName, variableName, eventClass);
-	}
-}
diff --git a/src/main/java/com/jwebmp/core/databind/IClientVariableWatcher.java b/src/main/java/com/jwebmp/core/databind/IClientVariableWatcher.java
deleted file mode 100644
index 98526fca..00000000
--- a/src/main/java/com/jwebmp/core/databind/IClientVariableWatcher.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.jwebmp.core.databind;
-
-import com.jwebmp.core.events.change.ChangeAdapter;
-
-import jakarta.validation.constraints.NotNull;
-
-/**
- * SPI for handling variable watchers. The returned string must be JavaScript that will watch the given variable
- */
-@FunctionalInterface
-public interface IClientVariableWatcher
-{
-	/**
-	 * SPI for handling variable watchers. The returned string must be JavaScript that will watch the given variable
-	 *
-	 * @param watchName
-	 * 		The variable watch name
-	 * @param variableName
-	 * 		The variable name
-	 * @param eventClass
-	 * 		The event class
-	 *
-	 * @return The java script to render
-	 */
-	String onClientVariableRequest(@NotNull String watchName, @NotNull String variableName, @NotNull Class<? extends ChangeAdapter<?>> eventClass);
-}
diff --git a/src/main/java/com/jwebmp/core/databind/IConfiguration.java b/src/main/java/com/jwebmp/core/databind/IConfiguration.java
deleted file mode 100644
index 145f79ac..00000000
--- a/src/main/java/com/jwebmp/core/databind/IConfiguration.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.jwebmp.core.databind;
-
-public interface IConfiguration
-{
-}
diff --git a/src/main/java/com/jwebmp/core/databind/IOnComponentAdded.java b/src/main/java/com/jwebmp/core/databind/IOnComponentAdded.java
deleted file mode 100644
index 935f77af..00000000
--- a/src/main/java/com/jwebmp/core/databind/IOnComponentAdded.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.jwebmp.core.databind;
-
-import com.guicedee.guicedinjection.interfaces.*;
-import com.jwebmp.core.base.*;
-import com.jwebmp.core.base.html.interfaces.*;
-
-public interface IOnComponentAdded<J extends IOnComponentAdded<J>> extends IDefaultService<J>
-{
-	/**
-	 * intercepts the html render and provides a return value on whether children should be rendered
-	 *
-	 * @param component
-	 * @return
-	 */
-	void onComponentAdded(ComponentHierarchyBase<GlobalChildren, ?, ?, ?, ?> parent, ComponentHierarchyBase<GlobalChildren, ?, ?, ?, ?> component);
-}
diff --git a/src/main/java/com/jwebmp/core/databind/IOnComponentHtmlRender.java b/src/main/java/com/jwebmp/core/databind/IOnComponentHtmlRender.java
deleted file mode 100644
index ca7222c9..00000000
--- a/src/main/java/com/jwebmp/core/databind/IOnComponentHtmlRender.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.jwebmp.core.databind;
-
-import com.guicedee.guicedinjection.interfaces.*;
-import com.jwebmp.core.base.*;
-
-public interface IOnComponentHtmlRender<J extends IOnComponentHtmlRender<J>> extends IDefaultService<J>
-{
-	/**
-	 * intercepts the html render and provides a return value on whether children should be rendered
-	 * @param component
-	 * @return whether or not to render children
-	 */
-	boolean onHtmlRender(ComponentHierarchyBase<?, ?, ?, ?, ?> component);
-}
diff --git a/src/main/java/com/jwebmp/core/databind/IOnDataBind.java b/src/main/java/com/jwebmp/core/databind/IOnDataBind.java
deleted file mode 100644
index 3eb6741e..00000000
--- a/src/main/java/com/jwebmp/core/databind/IOnDataBind.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.jwebmp.core.databind;
-
-import com.jwebmp.core.base.ComponentDataBindingBase;
-import com.guicedee.guicedinjection.interfaces.IDefaultService;
-
-import jakarta.validation.constraints.NotNull;
-
-/**
- * SPI to do something when on bind is called
- */
-public interface IOnDataBind<J extends IOnDataBind<J>>
-		extends IDefaultService<J>
-{
-	/**
-	 * SPI to do something when on bind is called
-	 *
-	 * @param component
-	 * 		The component to bind
-	 * @param bindingValue
-	 * 		The binding value to adhere to
-	 */
-	void onBind(@NotNull ComponentDataBindingBase component, String bindingValue);
-}
diff --git a/src/main/java/com/jwebmp/core/databind/IOnDataBindCloak.java b/src/main/java/com/jwebmp/core/databind/IOnDataBindCloak.java
deleted file mode 100644
index 06a0d86b..00000000
--- a/src/main/java/com/jwebmp/core/databind/IOnDataBindCloak.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.jwebmp.core.databind;
-
-import com.guicedee.guicedinjection.interfaces.IDefaultService;
-import com.jwebmp.core.base.ComponentDataBindingBase;
-
-import jakarta.validation.constraints.NotNull;
-
-/**
- * SPI to do something when on bind is called
- */
-@FunctionalInterface
-public interface IOnDataBindCloak extends IDefaultService<IOnDataBindCloak>
-{
-	/**
-	 * SPI to do something when on bind is called
-	 *
-	 * @param component
-	 * 		The component to bind
-	 */
-	void onCloak(@NotNull ComponentDataBindingBase component);
-}
diff --git a/src/main/java/com/jwebmp/core/events/IOnEventServiceBase.java b/src/main/java/com/jwebmp/core/events/IOnEventServiceBase.java
deleted file mode 100644
index c003a5a6..00000000
--- a/src/main/java/com/jwebmp/core/events/IOnEventServiceBase.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.jwebmp.core.events;
-
-import com.jwebmp.core.Event;
-import com.guicedee.guicedinjection.interfaces.IDefaultService;
-
-public interface IOnEventServiceBase<J extends IOnEventServiceBase<J>>
-		extends IDefaultService<J>
-{
-	/**
-	 * Occurs when the event is called
-	 */
-	void onCreate(Event<?, ?> e);
-
-	/**
-	 * Occurs when the event is called
-	 */
-	void onCall(Event<?, ?> e);
-}
diff --git a/src/main/java/com/jwebmp/core/events/activate/ActivateAdapter.java b/src/main/java/com/jwebmp/core/events/activate/ActivateAdapter.java
index 1032790a..3a558b2d 100644
--- a/src/main/java/com/jwebmp/core/events/activate/ActivateAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/activate/ActivateAdapter.java
@@ -23,6 +23,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnActivateService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import com.jwebmp.core.plugins.ComponentInformation;
 import lombok.extern.java.Log;
@@ -87,7 +88,7 @@ private void onCreate()
 	{
 		@SuppressWarnings("rawtypes")
 		Set<IOnActivateService> services = IGuiceContext.instance()
-		                                               .getLoader(IOnActivateService.class, ServiceLoader.load(IOnActivateService.class));
+                                                        .getLoader(IOnActivateService.class, ServiceLoader.load(IOnActivateService.class));
 		services.forEach(service -> service.onCreate(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/activate/IOnActivateService.java b/src/main/java/com/jwebmp/core/events/activate/IOnActivateService.java
deleted file mode 100644
index 986e803c..00000000
--- a/src/main/java/com/jwebmp/core/events/activate/IOnActivateService.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.jwebmp.core.events.activate;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-public interface IOnActivateService<J extends IOnActivateService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/beforeactivate/BeforeActivateAdapter.java b/src/main/java/com/jwebmp/core/events/beforeactivate/BeforeActivateAdapter.java
index 50b36ce5..267f3765 100644
--- a/src/main/java/com/jwebmp/core/events/beforeactivate/BeforeActivateAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/beforeactivate/BeforeActivateAdapter.java
@@ -23,6 +23,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnBeforeActivateService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import com.jwebmp.core.plugins.ComponentInformation;
 import lombok.extern.java.Log;
@@ -84,7 +85,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnBeforeActivateService> services = IGuiceContext.instance()
-		                                                     .getLoader(IOnBeforeActivateService.class, ServiceLoader.load(IOnBeforeActivateService.class));
+                                                              .getLoader(IOnBeforeActivateService.class, ServiceLoader.load(IOnBeforeActivateService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/beforeactivate/IOnBeforeActivateService.java b/src/main/java/com/jwebmp/core/events/beforeactivate/IOnBeforeActivateService.java
deleted file mode 100644
index 24c575e6..00000000
--- a/src/main/java/com/jwebmp/core/events/beforeactivate/IOnBeforeActivateService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.beforeactivate;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnBeforeActivateService<J extends IOnBeforeActivateService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/beforeclose/BeforeCloseAdapter.java b/src/main/java/com/jwebmp/core/events/beforeclose/BeforeCloseAdapter.java
index 6fff66b2..a4d77877 100644
--- a/src/main/java/com/jwebmp/core/events/beforeclose/BeforeCloseAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/beforeclose/BeforeCloseAdapter.java
@@ -23,6 +23,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnBeforeCloseService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import com.jwebmp.core.plugins.ComponentInformation;
 import lombok.extern.java.Log;
@@ -85,7 +86,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnBeforeCloseService> services = IGuiceContext.instance()
-		                                                  .getLoader(IOnBeforeCloseService.class, ServiceLoader.load(IOnBeforeCloseService.class));
+                                                           .getLoader(IOnBeforeCloseService.class, ServiceLoader.load(IOnBeforeCloseService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/beforeclose/IOnBeforeCloseService.java b/src/main/java/com/jwebmp/core/events/beforeclose/IOnBeforeCloseService.java
deleted file mode 100644
index 0a4241ed..00000000
--- a/src/main/java/com/jwebmp/core/events/beforeclose/IOnBeforeCloseService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.beforeclose;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnBeforeCloseService<J extends IOnBeforeCloseService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/beforeload/BeforeLoadAdapter.java b/src/main/java/com/jwebmp/core/events/beforeload/BeforeLoadAdapter.java
index b3548822..6bdffed8 100644
--- a/src/main/java/com/jwebmp/core/events/beforeload/BeforeLoadAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/beforeload/BeforeLoadAdapter.java
@@ -23,6 +23,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnBeforeLoadService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import com.jwebmp.core.plugins.ComponentInformation;
 import lombok.extern.java.Log;
@@ -84,7 +85,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnBeforeLoadService> services = IGuiceContext.instance()
-		                                                 .getLoader(IOnBeforeLoadService.class, ServiceLoader.load(IOnBeforeLoadService.class));
+                                                          .getLoader(IOnBeforeLoadService.class, ServiceLoader.load(IOnBeforeLoadService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/beforeload/IOnBeforeLoadService.java b/src/main/java/com/jwebmp/core/events/beforeload/IOnBeforeLoadService.java
deleted file mode 100644
index 4f9fe58e..00000000
--- a/src/main/java/com/jwebmp/core/events/beforeload/IOnBeforeLoadService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.beforeload;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnBeforeLoadService<J extends IOnBeforeLoadService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/beforestop/BeforeStopAdapter.java b/src/main/java/com/jwebmp/core/events/beforestop/BeforeStopAdapter.java
index c340bb1c..5958ab82 100644
--- a/src/main/java/com/jwebmp/core/events/beforestop/BeforeStopAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/beforestop/BeforeStopAdapter.java
@@ -23,6 +23,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnBeforeStopService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import com.jwebmp.core.plugins.ComponentInformation;
 import lombok.extern.java.Log;
@@ -84,7 +85,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnBeforeStopService> services = IGuiceContext.instance()
-		                                                 .getLoader(IOnBeforeStopService.class, ServiceLoader.load(IOnBeforeStopService.class));
+                                                          .getLoader(IOnBeforeStopService.class, ServiceLoader.load(IOnBeforeStopService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/beforestop/IOnBeforeStopService.java b/src/main/java/com/jwebmp/core/events/beforestop/IOnBeforeStopService.java
deleted file mode 100644
index d86a36d2..00000000
--- a/src/main/java/com/jwebmp/core/events/beforestop/IOnBeforeStopService.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.jwebmp.core.events.beforestop;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnBeforeStopService<J extends IOnBeforeStopService<J>>
-		extends IOnEventServiceBase<J>
-{
-}
diff --git a/src/main/java/com/jwebmp/core/events/blur/BlurAdapter.java b/src/main/java/com/jwebmp/core/events/blur/BlurAdapter.java
index 8f1e6cbf..815230b5 100644
--- a/src/main/java/com/jwebmp/core/events/blur/BlurAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/blur/BlurAdapter.java
@@ -23,6 +23,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnBlurService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import com.jwebmp.core.plugins.ComponentInformation;
 import lombok.extern.java.Log;
@@ -83,7 +84,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnBlurService> services = IGuiceContext.instance()
-		                                           .getLoader(IOnBlurService.class, ServiceLoader.load(IOnBlurService.class));
+                                                    .getLoader(IOnBlurService.class, ServiceLoader.load(IOnBlurService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/blur/IOnBlurService.java b/src/main/java/com/jwebmp/core/events/blur/IOnBlurService.java
deleted file mode 100644
index 7d6d55ff..00000000
--- a/src/main/java/com/jwebmp/core/events/blur/IOnBlurService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.blur;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnBlurService<J extends IOnBlurService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/buttonclick/ButtonClickAdapter.java b/src/main/java/com/jwebmp/core/events/buttonclick/ButtonClickAdapter.java
index d17d1c7e..452eede2 100644
--- a/src/main/java/com/jwebmp/core/events/buttonclick/ButtonClickAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/buttonclick/ButtonClickAdapter.java
@@ -22,6 +22,7 @@
 import com.jwebmp.core.base.ajax.AjaxCall;
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
+import com.jwebmp.core.events.services.IOnButtonClickService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import com.jwebmp.core.plugins.ComponentInformation;
 import lombok.extern.java.Log;
@@ -86,7 +87,7 @@ public void fireEvent(AjaxCall<?> ajaxObject, AjaxResponse<?> ajaxReceiver)
 	private void onCall()
 	{
 		Set<IOnButtonClickService> services = IGuiceContext.instance()
-		                                                  .getLoader(IOnButtonClickService.class, ServiceLoader.load(IOnButtonClickService.class));
+                                                           .getLoader(IOnButtonClickService.class, ServiceLoader.load(IOnButtonClickService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/buttonclick/IOnButtonClickService.java b/src/main/java/com/jwebmp/core/events/buttonclick/IOnButtonClickService.java
deleted file mode 100644
index c8e1606e..00000000
--- a/src/main/java/com/jwebmp/core/events/buttonclick/IOnButtonClickService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.buttonclick;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnButtonClickService<J extends IOnButtonClickService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/cancel/CancelAdapter.java b/src/main/java/com/jwebmp/core/events/cancel/CancelAdapter.java
index 6f165b08..6ce3eb7e 100644
--- a/src/main/java/com/jwebmp/core/events/cancel/CancelAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/cancel/CancelAdapter.java
@@ -22,6 +22,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnCancelService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import com.jwebmp.core.plugins.ComponentInformation;
 import lombok.extern.java.Log;
@@ -85,7 +86,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnCancelService> services = com.guicedee.client.IGuiceContext.instance()
-		            .getLoader(IOnCancelService.class, ServiceLoader.load(IOnCancelService.class));
+                                                                          .getLoader(IOnCancelService.class, ServiceLoader.load(IOnCancelService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/cancel/IOnCancelService.java b/src/main/java/com/jwebmp/core/events/cancel/IOnCancelService.java
deleted file mode 100644
index f20e58a8..00000000
--- a/src/main/java/com/jwebmp/core/events/cancel/IOnCancelService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.cancel;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnCancelService<J extends IOnCancelService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/change/ChangeAdapter.java b/src/main/java/com/jwebmp/core/events/change/ChangeAdapter.java
index ae349627..d2822ca6 100644
--- a/src/main/java/com/jwebmp/core/events/change/ChangeAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/change/ChangeAdapter.java
@@ -23,6 +23,7 @@
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
 import com.jwebmp.core.base.interfaces.IComponentHierarchyBase;
+import com.jwebmp.core.events.services.IOnChangeService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import com.jwebmp.core.plugins.ComponentInformation;
 import lombok.extern.java.Log;
@@ -87,7 +88,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnChangeService> services = com.guicedee.client.IGuiceContext.instance()
-		            .getLoader(IOnChangeService.class, ServiceLoader.load(IOnChangeService.class));
+                                                                          .getLoader(IOnChangeService.class, ServiceLoader.load(IOnChangeService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/change/IOnChangeService.java b/src/main/java/com/jwebmp/core/events/change/IOnChangeService.java
deleted file mode 100644
index 287d1289..00000000
--- a/src/main/java/com/jwebmp/core/events/change/IOnChangeService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.change;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnChangeService<J extends IOnChangeService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/checked/CheckedAdapter.java b/src/main/java/com/jwebmp/core/events/checked/CheckedAdapter.java
index 907065cd..a70faede 100644
--- a/src/main/java/com/jwebmp/core/events/checked/CheckedAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/checked/CheckedAdapter.java
@@ -23,6 +23,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnCheckedService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import lombok.extern.java.Log;
 
@@ -83,7 +84,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnCheckedService> services = IGuiceContext.instance()
-		                                              .getLoader(IOnCheckedService.class, ServiceLoader.load(IOnCheckedService.class));
+                                                       .getLoader(IOnCheckedService.class, ServiceLoader.load(IOnCheckedService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/checked/IOnCheckedService.java b/src/main/java/com/jwebmp/core/events/checked/IOnCheckedService.java
deleted file mode 100644
index bf0edfa5..00000000
--- a/src/main/java/com/jwebmp/core/events/checked/IOnCheckedService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.checked;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnCheckedService<J extends IOnCheckedService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/click/ClickAdapter.java b/src/main/java/com/jwebmp/core/events/click/ClickAdapter.java
index ada1d394..69a376a3 100644
--- a/src/main/java/com/jwebmp/core/events/click/ClickAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/click/ClickAdapter.java
@@ -26,6 +26,7 @@
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
 import com.jwebmp.core.base.html.interfaces.events.ParagraphEvents;
 import com.jwebmp.core.base.interfaces.IComponentHierarchyBase;
+import com.jwebmp.core.events.services.IOnClickService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import com.jwebmp.core.plugins.ComponentInformation;
 import lombok.extern.java.Log;
@@ -92,7 +93,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnClickService> services = IGuiceContext.instance()
-		                                            .getLoader(IOnClickService.class, ServiceLoader.load(IOnClickService.class));
+                                                     .getLoader(IOnClickService.class, ServiceLoader.load(IOnClickService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 	
diff --git a/src/main/java/com/jwebmp/core/events/click/IOnClickService.java b/src/main/java/com/jwebmp/core/events/click/IOnClickService.java
deleted file mode 100644
index 6ed7f821..00000000
--- a/src/main/java/com/jwebmp/core/events/click/IOnClickService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.click;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnClickService<J extends IOnClickService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/close/CloseAdapter.java b/src/main/java/com/jwebmp/core/events/close/CloseAdapter.java
index abfc2d89..6c26505e 100644
--- a/src/main/java/com/jwebmp/core/events/close/CloseAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/close/CloseAdapter.java
@@ -23,6 +23,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnCloseService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import com.jwebmp.core.plugins.ComponentInformation;
 import lombok.extern.java.Log;
@@ -86,7 +87,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnCloseService> services = IGuiceContext.instance()
-		                                            .getLoader(IOnCloseService.class, ServiceLoader.load(IOnCloseService.class));
+                                                     .getLoader(IOnCloseService.class, ServiceLoader.load(IOnCloseService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/close/IOnCloseService.java b/src/main/java/com/jwebmp/core/events/close/IOnCloseService.java
deleted file mode 100644
index 8b60e06d..00000000
--- a/src/main/java/com/jwebmp/core/events/close/IOnCloseService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.close;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnCloseService<J extends IOnCloseService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/complete/CompleteAdapter.java b/src/main/java/com/jwebmp/core/events/complete/CompleteAdapter.java
index 8bcd9748..433a6ad0 100644
--- a/src/main/java/com/jwebmp/core/events/complete/CompleteAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/complete/CompleteAdapter.java
@@ -23,6 +23,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnCompleteService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import com.jwebmp.core.plugins.ComponentInformation;
 import lombok.extern.java.Log;
@@ -87,7 +88,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnCompleteService> services = IGuiceContext.instance()
-		                                               .getLoader(IOnCompleteService.class, ServiceLoader.load(IOnCompleteService.class));
+                                                        .getLoader(IOnCompleteService.class, ServiceLoader.load(IOnCompleteService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/complete/IOnCompleteService.java b/src/main/java/com/jwebmp/core/events/complete/IOnCompleteService.java
deleted file mode 100644
index 27e80700..00000000
--- a/src/main/java/com/jwebmp/core/events/complete/IOnCompleteService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.complete;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnCompleteService<J extends IOnCompleteService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/create/CreateAdapter.java b/src/main/java/com/jwebmp/core/events/create/CreateAdapter.java
index 6270c00a..6502fee9 100644
--- a/src/main/java/com/jwebmp/core/events/create/CreateAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/create/CreateAdapter.java
@@ -22,6 +22,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnCreateService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import com.jwebmp.core.plugins.ComponentInformation;
 import lombok.extern.java.Log;
@@ -87,7 +88,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnCreateService> services = com.guicedee.client.IGuiceContext.instance()
-		            .getLoader(IOnCreateService.class, ServiceLoader.load(IOnCreateService.class));
+                                                                          .getLoader(IOnCreateService.class, ServiceLoader.load(IOnCreateService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/create/IOnCreateService.java b/src/main/java/com/jwebmp/core/events/create/IOnCreateService.java
deleted file mode 100644
index a4fe18c6..00000000
--- a/src/main/java/com/jwebmp/core/events/create/IOnCreateService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.create;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnCreateService<J extends IOnCreateService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/deactivate/DeactivateAdapter.java b/src/main/java/com/jwebmp/core/events/deactivate/DeactivateAdapter.java
index 9c178558..19fcce22 100644
--- a/src/main/java/com/jwebmp/core/events/deactivate/DeactivateAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/deactivate/DeactivateAdapter.java
@@ -23,6 +23,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnDeActivateService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import com.jwebmp.core.plugins.ComponentInformation;
 import lombok.extern.java.Log;
@@ -87,7 +88,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnDeActivateService> services = IGuiceContext.instance()
-		                                                 .getLoader(IOnDeActivateService.class, ServiceLoader.load(IOnDeActivateService.class));
+                                                          .getLoader(IOnDeActivateService.class, ServiceLoader.load(IOnDeActivateService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/deactivate/IOnDeActivateService.java b/src/main/java/com/jwebmp/core/events/deactivate/IOnDeActivateService.java
deleted file mode 100644
index 17de5b13..00000000
--- a/src/main/java/com/jwebmp/core/events/deactivate/IOnDeActivateService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.deactivate;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnDeActivateService<J extends IOnDeActivateService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/drag/DragAdapter.java b/src/main/java/com/jwebmp/core/events/drag/DragAdapter.java
index 98f07171..8fadff59 100644
--- a/src/main/java/com/jwebmp/core/events/drag/DragAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/drag/DragAdapter.java
@@ -23,6 +23,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnDragService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import com.jwebmp.core.plugins.ComponentInformation;
 import lombok.extern.java.Log;
@@ -86,7 +87,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnDragService> services = IGuiceContext.instance()
-		                                           .getLoader(IOnDragService.class, ServiceLoader.load(IOnDragService.class));
+                                                    .getLoader(IOnDragService.class, ServiceLoader.load(IOnDragService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/drag/IOnDragService.java b/src/main/java/com/jwebmp/core/events/drag/IOnDragService.java
deleted file mode 100644
index 7d531798..00000000
--- a/src/main/java/com/jwebmp/core/events/drag/IOnDragService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.drag;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnDragService<J extends IOnDragService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/dragstart/DragStartAdapter.java b/src/main/java/com/jwebmp/core/events/dragstart/DragStartAdapter.java
index 079e848e..b8f4d54c 100644
--- a/src/main/java/com/jwebmp/core/events/dragstart/DragStartAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/dragstart/DragStartAdapter.java
@@ -22,6 +22,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnDragStartService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import com.jwebmp.core.plugins.ComponentInformation;
 import lombok.extern.java.Log;
@@ -84,7 +85,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnDragStartService> services = com.guicedee.client.IGuiceContext.instance()
-		            .getLoader(IOnDragStartService.class, ServiceLoader.load(IOnDragStartService.class));
+                                                                             .getLoader(IOnDragStartService.class, ServiceLoader.load(IOnDragStartService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/dragstart/IOnDragStartService.java b/src/main/java/com/jwebmp/core/events/dragstart/IOnDragStartService.java
deleted file mode 100644
index 3a11da98..00000000
--- a/src/main/java/com/jwebmp/core/events/dragstart/IOnDragStartService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.dragstart;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnDragStartService<J extends IOnDragStartService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/dragstop/DragStopAdapter.java b/src/main/java/com/jwebmp/core/events/dragstop/DragStopAdapter.java
index 88dfb72f..6fcd0fb0 100644
--- a/src/main/java/com/jwebmp/core/events/dragstop/DragStopAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/dragstop/DragStopAdapter.java
@@ -23,6 +23,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnDragStopService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import com.jwebmp.core.plugins.ComponentInformation;
 import lombok.extern.java.Log;
@@ -87,7 +88,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnDragStopService> services = IGuiceContext.instance()
-		                                               .getLoader(IOnDragStopService.class, ServiceLoader.load(IOnDragStopService.class));
+                                                        .getLoader(IOnDragStopService.class, ServiceLoader.load(IOnDragStopService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/dragstop/IOnDragStopService.java b/src/main/java/com/jwebmp/core/events/dragstop/IOnDragStopService.java
deleted file mode 100644
index 9ab78fe3..00000000
--- a/src/main/java/com/jwebmp/core/events/dragstop/IOnDragStopService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.dragstop;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnDragStopService<J extends IOnDragStopService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/drop/DropAdapter.java b/src/main/java/com/jwebmp/core/events/drop/DropAdapter.java
index 40b63502..8105b8ed 100644
--- a/src/main/java/com/jwebmp/core/events/drop/DropAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/drop/DropAdapter.java
@@ -23,6 +23,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnDropService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import com.jwebmp.core.plugins.ComponentInformation;
 import lombok.extern.java.Log;
@@ -87,7 +88,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnDropService> services = IGuiceContext.instance()
-		                                           .getLoader(IOnDropService.class, ServiceLoader.load(IOnDropService.class));
+                                                    .getLoader(IOnDropService.class, ServiceLoader.load(IOnDropService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/drop/IOnDropService.java b/src/main/java/com/jwebmp/core/events/drop/IOnDropService.java
deleted file mode 100644
index 4743e6c9..00000000
--- a/src/main/java/com/jwebmp/core/events/drop/IOnDropService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.drop;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnDropService<J extends IOnDropService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/dropout/DropOutAdapter.java b/src/main/java/com/jwebmp/core/events/dropout/DropOutAdapter.java
index 667b6f5d..0bf65f0e 100644
--- a/src/main/java/com/jwebmp/core/events/dropout/DropOutAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/dropout/DropOutAdapter.java
@@ -23,6 +23,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnDropOutService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import com.jwebmp.core.plugins.ComponentInformation;
 import lombok.extern.java.Log;
@@ -87,7 +88,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnDropOutService> services = IGuiceContext.instance()
-		                                              .getLoader(IOnDropOutService.class, ServiceLoader.load(IOnDropOutService.class));
+                                                       .getLoader(IOnDropOutService.class, ServiceLoader.load(IOnDropOutService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/dropout/IOnDropOutService.java b/src/main/java/com/jwebmp/core/events/dropout/IOnDropOutService.java
deleted file mode 100644
index 95186aa0..00000000
--- a/src/main/java/com/jwebmp/core/events/dropout/IOnDropOutService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.dropout;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnDropOutService<J extends IOnDropOutService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/dropover/DropOverAdapter.java b/src/main/java/com/jwebmp/core/events/dropover/DropOverAdapter.java
index 75383159..9a8d7753 100644
--- a/src/main/java/com/jwebmp/core/events/dropover/DropOverAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/dropover/DropOverAdapter.java
@@ -23,6 +23,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnDropOverService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import com.jwebmp.core.plugins.ComponentInformation;
 import lombok.extern.java.Log;
@@ -87,7 +88,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnDropOverService> services = IGuiceContext.instance()
-		                                               .getLoader(IOnDropOverService.class, ServiceLoader.load(IOnDropOverService.class));
+                                                        .getLoader(IOnDropOverService.class, ServiceLoader.load(IOnDropOverService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/dropover/IOnDropOverService.java b/src/main/java/com/jwebmp/core/events/dropover/IOnDropOverService.java
deleted file mode 100644
index 03bdbe69..00000000
--- a/src/main/java/com/jwebmp/core/events/dropover/IOnDropOverService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.dropover;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnDropOverService<J extends IOnDropOverService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/focus/FocusAdapter.java b/src/main/java/com/jwebmp/core/events/focus/FocusAdapter.java
index 924dc77b..4204e103 100644
--- a/src/main/java/com/jwebmp/core/events/focus/FocusAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/focus/FocusAdapter.java
@@ -23,6 +23,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnFocusService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import com.jwebmp.core.plugins.ComponentInformation;
 import lombok.extern.java.Log;
@@ -87,7 +88,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnFocusService> services = IGuiceContext.instance()
-		                                            .getLoader(IOnFocusService.class, ServiceLoader.load(IOnFocusService.class));
+                                                     .getLoader(IOnFocusService.class, ServiceLoader.load(IOnFocusService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/focus/IOnFocusService.java b/src/main/java/com/jwebmp/core/events/focus/IOnFocusService.java
deleted file mode 100644
index 2b04ddd3..00000000
--- a/src/main/java/com/jwebmp/core/events/focus/IOnFocusService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.focus;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnFocusService<J extends IOnFocusService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/keydown/IOnKeyDownService.java b/src/main/java/com/jwebmp/core/events/keydown/IOnKeyDownService.java
deleted file mode 100644
index f2fd930b..00000000
--- a/src/main/java/com/jwebmp/core/events/keydown/IOnKeyDownService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.keydown;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnKeyDownService<J extends IOnKeyDownService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/keydown/KeyDownAdapter.java b/src/main/java/com/jwebmp/core/events/keydown/KeyDownAdapter.java
index 0dc0a533..2c6719bb 100644
--- a/src/main/java/com/jwebmp/core/events/keydown/KeyDownAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/keydown/KeyDownAdapter.java
@@ -23,6 +23,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnKeyDownService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import lombok.extern.java.Log;
 
@@ -83,7 +84,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnKeyDownService> services = IGuiceContext.instance()
-		                                              .getLoader(IOnKeyDownService.class, ServiceLoader.load(IOnKeyDownService.class));
+                                                       .getLoader(IOnKeyDownService.class, ServiceLoader.load(IOnKeyDownService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/keypressed/IOnKeyPressedService.java b/src/main/java/com/jwebmp/core/events/keypressed/IOnKeyPressedService.java
deleted file mode 100644
index a4f66e27..00000000
--- a/src/main/java/com/jwebmp/core/events/keypressed/IOnKeyPressedService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.keypressed;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnKeyPressedService<J extends IOnKeyPressedService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/keypressed/KeyPressedAdapter.java b/src/main/java/com/jwebmp/core/events/keypressed/KeyPressedAdapter.java
index e806ecb6..11d4b13c 100644
--- a/src/main/java/com/jwebmp/core/events/keypressed/KeyPressedAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/keypressed/KeyPressedAdapter.java
@@ -23,6 +23,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnKeyPressedService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import lombok.extern.java.Log;
 
@@ -86,7 +87,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnKeyPressedService> services = IGuiceContext.instance()
-		                                                 .getLoader(IOnKeyPressedService.class, ServiceLoader.load(IOnKeyPressedService.class));
+                                                          .getLoader(IOnKeyPressedService.class, ServiceLoader.load(IOnKeyPressedService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/keyup/IOnKeyUpService.java b/src/main/java/com/jwebmp/core/events/keyup/IOnKeyUpService.java
deleted file mode 100644
index 288806bb..00000000
--- a/src/main/java/com/jwebmp/core/events/keyup/IOnKeyUpService.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.jwebmp.core.events.keyup;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-public interface IOnKeyUpService<J extends IOnKeyUpService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/keyup/KeyUpAdapter.java b/src/main/java/com/jwebmp/core/events/keyup/KeyUpAdapter.java
index 630b39a3..3d2f79e3 100644
--- a/src/main/java/com/jwebmp/core/events/keyup/KeyUpAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/keyup/KeyUpAdapter.java
@@ -23,6 +23,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnKeyUpService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import lombok.extern.java.Log;
 
@@ -83,7 +84,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnKeyUpService> services = IGuiceContext.instance()
-		                                            .getLoader(IOnKeyUpService.class, ServiceLoader.load(IOnKeyUpService.class));
+                                                     .getLoader(IOnKeyUpService.class, ServiceLoader.load(IOnKeyUpService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/load/IOnLoadService.java b/src/main/java/com/jwebmp/core/events/load/IOnLoadService.java
deleted file mode 100644
index 6a2a0dbe..00000000
--- a/src/main/java/com/jwebmp/core/events/load/IOnLoadService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.load;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnLoadService<J extends IOnLoadService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/load/LoadAdapter.java b/src/main/java/com/jwebmp/core/events/load/LoadAdapter.java
index 85e648b5..a9cc6eab 100644
--- a/src/main/java/com/jwebmp/core/events/load/LoadAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/load/LoadAdapter.java
@@ -23,6 +23,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnLoadService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import lombok.extern.java.Log;
 
@@ -83,7 +84,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnLoadService> services = IGuiceContext.instance()
-		                                           .getLoader(IOnLoadService.class, ServiceLoader.load(IOnLoadService.class));
+                                                    .getLoader(IOnLoadService.class, ServiceLoader.load(IOnLoadService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/mousedown/IOnMouseDownService.java b/src/main/java/com/jwebmp/core/events/mousedown/IOnMouseDownService.java
deleted file mode 100644
index 6f533eb9..00000000
--- a/src/main/java/com/jwebmp/core/events/mousedown/IOnMouseDownService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.mousedown;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnMouseDownService<J extends IOnMouseDownService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/mousedown/MouseDownAdapter.java b/src/main/java/com/jwebmp/core/events/mousedown/MouseDownAdapter.java
index e285a6df..f7a1951e 100644
--- a/src/main/java/com/jwebmp/core/events/mousedown/MouseDownAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/mousedown/MouseDownAdapter.java
@@ -22,6 +22,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnMouseDownService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import lombok.extern.java.Log;
 
@@ -83,7 +84,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnMouseDownService> services = com.guicedee.client.IGuiceContext.instance()
-		            .getLoader(IOnMouseDownService.class, ServiceLoader.load(IOnMouseDownService.class));
+                                                                             .getLoader(IOnMouseDownService.class, ServiceLoader.load(IOnMouseDownService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/mouseenter/IOnMouseEnterService.java b/src/main/java/com/jwebmp/core/events/mouseenter/IOnMouseEnterService.java
deleted file mode 100644
index 7ae2603e..00000000
--- a/src/main/java/com/jwebmp/core/events/mouseenter/IOnMouseEnterService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.mouseenter;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnMouseEnterService<J extends IOnMouseEnterService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/mouseenter/MouseEnterAdapter.java b/src/main/java/com/jwebmp/core/events/mouseenter/MouseEnterAdapter.java
index 3d14973d..17edda43 100644
--- a/src/main/java/com/jwebmp/core/events/mouseenter/MouseEnterAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/mouseenter/MouseEnterAdapter.java
@@ -23,6 +23,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnMouseEnterService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import lombok.extern.java.Log;
 
@@ -84,7 +85,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnMouseEnterService> services = IGuiceContext.instance()
-		                                                 .getLoader(IOnMouseEnterService.class, ServiceLoader.load(IOnMouseEnterService.class));
+                                                          .getLoader(IOnMouseEnterService.class, ServiceLoader.load(IOnMouseEnterService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/mousemove/IOnMouseMoveService.java b/src/main/java/com/jwebmp/core/events/mousemove/IOnMouseMoveService.java
deleted file mode 100644
index 8a151f0a..00000000
--- a/src/main/java/com/jwebmp/core/events/mousemove/IOnMouseMoveService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.mousemove;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnMouseMoveService<J extends IOnMouseMoveService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/mousemove/MouseMoveAdapter.java b/src/main/java/com/jwebmp/core/events/mousemove/MouseMoveAdapter.java
index ea56e43a..59964017 100644
--- a/src/main/java/com/jwebmp/core/events/mousemove/MouseMoveAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/mousemove/MouseMoveAdapter.java
@@ -22,6 +22,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnMouseMoveService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import lombok.extern.java.Log;
 
@@ -84,7 +85,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnMouseMoveService> services = com.guicedee.client.IGuiceContext.instance()
-		            .getLoader(IOnMouseMoveService.class, ServiceLoader.load(IOnMouseMoveService.class));
+                                                                             .getLoader(IOnMouseMoveService.class, ServiceLoader.load(IOnMouseMoveService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/mouseout/IOnMouseOutService.java b/src/main/java/com/jwebmp/core/events/mouseout/IOnMouseOutService.java
deleted file mode 100644
index ede31d09..00000000
--- a/src/main/java/com/jwebmp/core/events/mouseout/IOnMouseOutService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.mouseout;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnMouseOutService<J extends IOnMouseOutService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/mouseout/MouseOutAdapter.java b/src/main/java/com/jwebmp/core/events/mouseout/MouseOutAdapter.java
index d7b29d4f..fd01f960 100644
--- a/src/main/java/com/jwebmp/core/events/mouseout/MouseOutAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/mouseout/MouseOutAdapter.java
@@ -23,6 +23,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnMouseOutService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import lombok.extern.java.Log;
 
diff --git a/src/main/java/com/jwebmp/core/events/mouseover/IOnMouseOverService.java b/src/main/java/com/jwebmp/core/events/mouseover/IOnMouseOverService.java
deleted file mode 100644
index d7c0de17..00000000
--- a/src/main/java/com/jwebmp/core/events/mouseover/IOnMouseOverService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.mouseover;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnMouseOverService<J extends IOnMouseOverService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/mouseover/MouseOverAdapter.java b/src/main/java/com/jwebmp/core/events/mouseover/MouseOverAdapter.java
index bb69adae..cbe410d0 100644
--- a/src/main/java/com/jwebmp/core/events/mouseover/MouseOverAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/mouseover/MouseOverAdapter.java
@@ -22,6 +22,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnMouseOverService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import lombok.extern.java.Log;
 
@@ -81,7 +82,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnMouseOverService> services = com.guicedee.client.IGuiceContext.instance()
-		            .getLoader(IOnMouseOverService.class, ServiceLoader.load(IOnMouseOverService.class));
+                                                                             .getLoader(IOnMouseOverService.class, ServiceLoader.load(IOnMouseOverService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/mouseup/IOnMouseUpService.java b/src/main/java/com/jwebmp/core/events/mouseup/IOnMouseUpService.java
deleted file mode 100644
index f2424bd7..00000000
--- a/src/main/java/com/jwebmp/core/events/mouseup/IOnMouseUpService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.mouseup;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnMouseUpService<J extends IOnMouseUpService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/mouseup/MouseUpAdapter.java b/src/main/java/com/jwebmp/core/events/mouseup/MouseUpAdapter.java
index 9cb40cd8..09aebe63 100644
--- a/src/main/java/com/jwebmp/core/events/mouseup/MouseUpAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/mouseup/MouseUpAdapter.java
@@ -23,6 +23,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnMouseUpService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import lombok.extern.java.Log;
 
@@ -84,7 +85,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnMouseUpService> services = IGuiceContext.instance()
-		                                              .getLoader(IOnMouseUpService.class, ServiceLoader.load(IOnMouseUpService.class));
+                                                       .getLoader(IOnMouseUpService.class, ServiceLoader.load(IOnMouseUpService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/open/IOnOpenService.java b/src/main/java/com/jwebmp/core/events/open/IOnOpenService.java
deleted file mode 100644
index 42a8eee8..00000000
--- a/src/main/java/com/jwebmp/core/events/open/IOnOpenService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.open;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnOpenService<J extends IOnOpenService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/open/OpenAdapter.java b/src/main/java/com/jwebmp/core/events/open/OpenAdapter.java
index f81f1fe1..57953703 100644
--- a/src/main/java/com/jwebmp/core/events/open/OpenAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/open/OpenAdapter.java
@@ -23,6 +23,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnOpenService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import lombok.extern.java.Log;
 
@@ -83,7 +84,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnOpenService> services = IGuiceContext.instance()
-		                                           .getLoader(IOnOpenService.class, ServiceLoader.load(IOnOpenService.class));
+                                                    .getLoader(IOnOpenService.class, ServiceLoader.load(IOnOpenService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/receive/IOnReceiveService.java b/src/main/java/com/jwebmp/core/events/receive/IOnReceiveService.java
deleted file mode 100644
index 92a041ad..00000000
--- a/src/main/java/com/jwebmp/core/events/receive/IOnReceiveService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.receive;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnReceiveService<J extends IOnReceiveService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/receive/ReceiveAdapter.java b/src/main/java/com/jwebmp/core/events/receive/ReceiveAdapter.java
index a02edf2a..1c7fc281 100644
--- a/src/main/java/com/jwebmp/core/events/receive/ReceiveAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/receive/ReceiveAdapter.java
@@ -23,6 +23,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnReceiveService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import lombok.extern.java.Log;
 
@@ -84,7 +85,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnReceiveService> services = IGuiceContext.instance()
-		                                              .getLoader(IOnReceiveService.class, ServiceLoader.load(IOnReceiveService.class));
+                                                       .getLoader(IOnReceiveService.class, ServiceLoader.load(IOnReceiveService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/remove/IOnRemoveService.java b/src/main/java/com/jwebmp/core/events/remove/IOnRemoveService.java
deleted file mode 100644
index 3509bb11..00000000
--- a/src/main/java/com/jwebmp/core/events/remove/IOnRemoveService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.remove;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnRemoveService<J extends IOnRemoveService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/remove/RemoveAdapter.java b/src/main/java/com/jwebmp/core/events/remove/RemoveAdapter.java
index bd6d4d3d..4307c59b 100644
--- a/src/main/java/com/jwebmp/core/events/remove/RemoveAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/remove/RemoveAdapter.java
@@ -22,6 +22,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnRemoveService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import lombok.extern.java.Log;
 
@@ -83,7 +84,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnRemoveService> services = com.guicedee.client.IGuiceContext.instance()
-		            .getLoader(IOnRemoveService.class, ServiceLoader.load(IOnRemoveService.class));
+                                                                          .getLoader(IOnRemoveService.class, ServiceLoader.load(IOnRemoveService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/resize/IOnResizeService.java b/src/main/java/com/jwebmp/core/events/resize/IOnResizeService.java
deleted file mode 100644
index 3979535d..00000000
--- a/src/main/java/com/jwebmp/core/events/resize/IOnResizeService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.resize;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnResizeService<J extends IOnResizeService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/resize/ResizeAdapter.java b/src/main/java/com/jwebmp/core/events/resize/ResizeAdapter.java
index be7fc3fc..37970c11 100644
--- a/src/main/java/com/jwebmp/core/events/resize/ResizeAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/resize/ResizeAdapter.java
@@ -22,6 +22,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnResizeService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import lombok.extern.java.Log;
 
@@ -83,7 +84,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnResizeService> services = com.guicedee.client.IGuiceContext.instance()
-		            .getLoader(IOnResizeService.class, ServiceLoader.load(IOnResizeService.class));
+                                                                          .getLoader(IOnResizeService.class, ServiceLoader.load(IOnResizeService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/resizestart/IOnResizeStartService.java b/src/main/java/com/jwebmp/core/events/resizestart/IOnResizeStartService.java
deleted file mode 100644
index 88b821b5..00000000
--- a/src/main/java/com/jwebmp/core/events/resizestart/IOnResizeStartService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.resizestart;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnResizeStartService<J extends IOnResizeStartService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/resizestart/ResizeStartAdapter.java b/src/main/java/com/jwebmp/core/events/resizestart/ResizeStartAdapter.java
index 488616bf..5d4d803c 100644
--- a/src/main/java/com/jwebmp/core/events/resizestart/ResizeStartAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/resizestart/ResizeStartAdapter.java
@@ -23,6 +23,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnResizeStartService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import lombok.extern.java.Log;
 
@@ -84,7 +85,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnResizeStartService> services = IGuiceContext.instance()
-		                                                  .getLoader(IOnResizeStartService.class, ServiceLoader.load(IOnResizeStartService.class));
+                                                           .getLoader(IOnResizeStartService.class, ServiceLoader.load(IOnResizeStartService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/resizestop/IOnResizeStopService.java b/src/main/java/com/jwebmp/core/events/resizestop/IOnResizeStopService.java
deleted file mode 100644
index 500c7d13..00000000
--- a/src/main/java/com/jwebmp/core/events/resizestop/IOnResizeStopService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.resizestop;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnResizeStopService<J extends IOnResizeStopService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/resizestop/ResizeStopAdapter.java b/src/main/java/com/jwebmp/core/events/resizestop/ResizeStopAdapter.java
index 7b2a9b2d..92005886 100644
--- a/src/main/java/com/jwebmp/core/events/resizestop/ResizeStopAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/resizestop/ResizeStopAdapter.java
@@ -23,6 +23,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnResizeStopService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import lombok.extern.java.Log;
 
@@ -83,7 +84,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnResizeStopService> services = IGuiceContext.instance()
-		                                                 .getLoader(IOnResizeStopService.class, ServiceLoader.load(IOnResizeStopService.class));
+                                                          .getLoader(IOnResizeStopService.class, ServiceLoader.load(IOnResizeStopService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/response/IOnResponseService.java b/src/main/java/com/jwebmp/core/events/response/IOnResponseService.java
deleted file mode 100644
index d8d41ac0..00000000
--- a/src/main/java/com/jwebmp/core/events/response/IOnResponseService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.response;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnResponseService<J extends IOnResponseService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/response/ResponseAdapter.java b/src/main/java/com/jwebmp/core/events/response/ResponseAdapter.java
index 760d7cd8..4a4bd704 100644
--- a/src/main/java/com/jwebmp/core/events/response/ResponseAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/response/ResponseAdapter.java
@@ -23,6 +23,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnResponseService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import lombok.extern.java.Log;
 
@@ -83,7 +84,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnResponseService> services = IGuiceContext.instance()
-		                                               .getLoader(IOnResponseService.class, ServiceLoader.load(IOnResponseService.class));
+                                                        .getLoader(IOnResponseService.class, ServiceLoader.load(IOnResponseService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/rightclick/IOnRightClickService.java b/src/main/java/com/jwebmp/core/events/rightclick/IOnRightClickService.java
deleted file mode 100644
index 96161fb6..00000000
--- a/src/main/java/com/jwebmp/core/events/rightclick/IOnRightClickService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.rightclick;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnRightClickService<J extends IOnRightClickService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/rightclick/RightClickAdapter.java b/src/main/java/com/jwebmp/core/events/rightclick/RightClickAdapter.java
index d4e2d36c..079c34a9 100644
--- a/src/main/java/com/jwebmp/core/events/rightclick/RightClickAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/rightclick/RightClickAdapter.java
@@ -25,6 +25,7 @@
 import com.jwebmp.core.base.html.interfaces.events.BodyEvents;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
 import com.jwebmp.core.base.html.interfaces.events.ParagraphEvents;
+import com.jwebmp.core.events.services.IOnRightClickService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import lombok.extern.java.Log;
 
@@ -83,7 +84,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnRightClickService> services = IGuiceContext.instance()
-		                                                 .getLoader(IOnRightClickService.class, ServiceLoader.load(IOnRightClickService.class));
+                                                          .getLoader(IOnRightClickService.class, ServiceLoader.load(IOnRightClickService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 	
diff --git a/src/main/java/com/jwebmp/core/events/search/IOnSearchService.java b/src/main/java/com/jwebmp/core/events/search/IOnSearchService.java
deleted file mode 100644
index 48bde623..00000000
--- a/src/main/java/com/jwebmp/core/events/search/IOnSearchService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.search;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnSearchService<J extends IOnSearchService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/search/SearchAdapter.java b/src/main/java/com/jwebmp/core/events/search/SearchAdapter.java
index bf649812..66f8db15 100644
--- a/src/main/java/com/jwebmp/core/events/search/SearchAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/search/SearchAdapter.java
@@ -22,6 +22,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnSearchService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import lombok.extern.java.Log;
 
@@ -82,7 +83,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnSearchService> services = com.guicedee.client.IGuiceContext.instance()
-		            .getLoader(IOnSearchService.class, ServiceLoader.load(IOnSearchService.class));
+                                                                          .getLoader(IOnSearchService.class, ServiceLoader.load(IOnSearchService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/select/IOnSelectService.java b/src/main/java/com/jwebmp/core/events/select/IOnSelectService.java
deleted file mode 100644
index c1c51d71..00000000
--- a/src/main/java/com/jwebmp/core/events/select/IOnSelectService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.select;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnSelectService<J extends IOnSelectService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/select/SelectAdapter.java b/src/main/java/com/jwebmp/core/events/select/SelectAdapter.java
index 90fe36c5..ccdb25a7 100644
--- a/src/main/java/com/jwebmp/core/events/select/SelectAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/select/SelectAdapter.java
@@ -22,6 +22,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnSelectService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import lombok.extern.java.Log;
 
@@ -82,7 +83,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnSelectService> services = com.guicedee.client.IGuiceContext.instance()
-		            .getLoader(IOnSelectService.class, ServiceLoader.load(IOnSelectService.class));
+                                                                          .getLoader(IOnSelectService.class, ServiceLoader.load(IOnSelectService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/selected/IOnSelectedService.java b/src/main/java/com/jwebmp/core/events/selected/IOnSelectedService.java
deleted file mode 100644
index a9ec688f..00000000
--- a/src/main/java/com/jwebmp/core/events/selected/IOnSelectedService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.selected;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnSelectedService<J extends IOnSelectedService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/selected/SelectedAdapter.java b/src/main/java/com/jwebmp/core/events/selected/SelectedAdapter.java
index 1c1eaacb..712ceaed 100644
--- a/src/main/java/com/jwebmp/core/events/selected/SelectedAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/selected/SelectedAdapter.java
@@ -24,6 +24,7 @@
 import com.jwebmp.core.base.html.Option;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnSelectedService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import lombok.extern.java.Log;
 
@@ -86,7 +87,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnSelectedService> services = IGuiceContext.instance()
-		                                               .getLoader(IOnSelectedService.class, ServiceLoader.load(IOnSelectedService.class));
+                                                        .getLoader(IOnSelectedService.class, ServiceLoader.load(IOnSelectedService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/selecting/IOnSelectingService.java b/src/main/java/com/jwebmp/core/events/selecting/IOnSelectingService.java
deleted file mode 100644
index 67b83f0f..00000000
--- a/src/main/java/com/jwebmp/core/events/selecting/IOnSelectingService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.selecting;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnSelectingService<J extends IOnSelectingService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/selecting/SelectingAdapter.java b/src/main/java/com/jwebmp/core/events/selecting/SelectingAdapter.java
index 5ae590f0..1e2f2789 100644
--- a/src/main/java/com/jwebmp/core/events/selecting/SelectingAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/selecting/SelectingAdapter.java
@@ -22,6 +22,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnSelectingService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import lombok.extern.java.Log;
 
@@ -82,7 +83,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnSelectingService> services = com.guicedee.client.IGuiceContext.instance()
-		            .getLoader(IOnSelectingService.class, ServiceLoader.load(IOnSelectingService.class));
+                                                                             .getLoader(IOnSelectingService.class, ServiceLoader.load(IOnSelectingService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/slide/IOnSlideService.java b/src/main/java/com/jwebmp/core/events/slide/IOnSlideService.java
deleted file mode 100644
index b1578c87..00000000
--- a/src/main/java/com/jwebmp/core/events/slide/IOnSlideService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.slide;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnSlideService<J extends IOnSlideService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/slide/SlideAdapter.java b/src/main/java/com/jwebmp/core/events/slide/SlideAdapter.java
index da5ad5eb..3ea7f6f1 100644
--- a/src/main/java/com/jwebmp/core/events/slide/SlideAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/slide/SlideAdapter.java
@@ -23,6 +23,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnSlideService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import lombok.extern.java.Log;
 
diff --git a/src/main/java/com/jwebmp/core/events/sort/IOnSortService.java b/src/main/java/com/jwebmp/core/events/sort/IOnSortService.java
deleted file mode 100644
index 6f9f0467..00000000
--- a/src/main/java/com/jwebmp/core/events/sort/IOnSortService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.sort;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnSortService<J extends IOnSortService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/sort/SortAdapter.java b/src/main/java/com/jwebmp/core/events/sort/SortAdapter.java
index aa612375..b28c7526 100644
--- a/src/main/java/com/jwebmp/core/events/sort/SortAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/sort/SortAdapter.java
@@ -23,6 +23,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnSortService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import lombok.extern.java.Log;
 
@@ -91,7 +92,7 @@ public void preConfigure()
 	private void onCreate()
 	{
 		Set<IOnSortService> services = IGuiceContext.instance()
-		                                           .getLoader(IOnSortService.class, ServiceLoader.load(IOnSortService.class));
+                                                    .getLoader(IOnSortService.class, ServiceLoader.load(IOnSortService.class));
 		services.forEach(service -> service.onCreate(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/spin/IOnSpinService.java b/src/main/java/com/jwebmp/core/events/spin/IOnSpinService.java
deleted file mode 100644
index 8377d44f..00000000
--- a/src/main/java/com/jwebmp/core/events/spin/IOnSpinService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.spin;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnSpinService<J extends IOnSpinService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/spin/SpinAdapter.java b/src/main/java/com/jwebmp/core/events/spin/SpinAdapter.java
index 6048a457..6eeabc22 100644
--- a/src/main/java/com/jwebmp/core/events/spin/SpinAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/spin/SpinAdapter.java
@@ -23,6 +23,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnSpinService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import lombok.extern.java.Log;
 
@@ -83,7 +84,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnSpinService> services = IGuiceContext.instance()
-		                                           .getLoader(IOnSpinService.class, ServiceLoader.load(IOnSpinService.class));
+                                                    .getLoader(IOnSpinService.class, ServiceLoader.load(IOnSpinService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/start/IOnStartService.java b/src/main/java/com/jwebmp/core/events/start/IOnStartService.java
deleted file mode 100644
index b00468e7..00000000
--- a/src/main/java/com/jwebmp/core/events/start/IOnStartService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.start;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnStartService<J extends IOnStartService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/start/StartAdapter.java b/src/main/java/com/jwebmp/core/events/start/StartAdapter.java
index b5f55597..7c8e3147 100644
--- a/src/main/java/com/jwebmp/core/events/start/StartAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/start/StartAdapter.java
@@ -23,6 +23,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnStartService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import lombok.extern.java.Log;
 
@@ -82,7 +83,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnStartService> services = IGuiceContext.instance()
-		                                            .getLoader(IOnStartService.class, ServiceLoader.load(IOnStartService.class));
+                                                     .getLoader(IOnStartService.class, ServiceLoader.load(IOnStartService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/stop/IOnStopService.java b/src/main/java/com/jwebmp/core/events/stop/IOnStopService.java
deleted file mode 100644
index e111b773..00000000
--- a/src/main/java/com/jwebmp/core/events/stop/IOnStopService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.stop;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnStopService<J extends IOnStopService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/stop/StopAdapter.java b/src/main/java/com/jwebmp/core/events/stop/StopAdapter.java
index f1ca2179..e82a02f3 100644
--- a/src/main/java/com/jwebmp/core/events/stop/StopAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/stop/StopAdapter.java
@@ -23,6 +23,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnStopService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import lombok.extern.java.Log;
 
@@ -82,7 +83,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnStopService> services = IGuiceContext.instance()
-		                                           .getLoader(IOnStopService.class, ServiceLoader.load(IOnStopService.class));
+                                                    .getLoader(IOnStopService.class, ServiceLoader.load(IOnStopService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/submit/IOnSubmitService.java b/src/main/java/com/jwebmp/core/events/submit/IOnSubmitService.java
deleted file mode 100644
index 758f8d74..00000000
--- a/src/main/java/com/jwebmp/core/events/submit/IOnSubmitService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.submit;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnSubmitService<J extends IOnSubmitService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/submit/SubmitAdapter.java b/src/main/java/com/jwebmp/core/events/submit/SubmitAdapter.java
index 85f9bef8..1934465e 100644
--- a/src/main/java/com/jwebmp/core/events/submit/SubmitAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/submit/SubmitAdapter.java
@@ -25,6 +25,7 @@
 import com.jwebmp.core.base.html.interfaces.events.BodyEvents;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
 import com.jwebmp.core.base.html.interfaces.events.ParagraphEvents;
+import com.jwebmp.core.events.services.IOnSubmitService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import com.jwebmp.core.plugins.ComponentInformation;
 import lombok.extern.java.Log;
@@ -95,7 +96,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnSubmitService> services = com.guicedee.client.IGuiceContext.instance()
-		            .getLoader(IOnSubmitService.class, ServiceLoader.load(IOnSubmitService.class));
+                                                                          .getLoader(IOnSubmitService.class, ServiceLoader.load(IOnSubmitService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/unselected/IOnUnSelectedService.java b/src/main/java/com/jwebmp/core/events/unselected/IOnUnSelectedService.java
deleted file mode 100644
index 32889efe..00000000
--- a/src/main/java/com/jwebmp/core/events/unselected/IOnUnSelectedService.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.jwebmp.core.events.unselected;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-public interface IOnUnSelectedService<J extends IOnUnSelectedService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/unselected/UnselectedAdapter.java b/src/main/java/com/jwebmp/core/events/unselected/UnselectedAdapter.java
index 0842363c..3febc544 100644
--- a/src/main/java/com/jwebmp/core/events/unselected/UnselectedAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/unselected/UnselectedAdapter.java
@@ -23,6 +23,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnUnSelectedService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import lombok.extern.java.Log;
 
@@ -83,7 +84,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnUnSelectedService> services = IGuiceContext.instance()
-		                                                 .getLoader(IOnUnSelectedService.class, ServiceLoader.load(IOnUnSelectedService.class));
+                                                          .getLoader(IOnUnSelectedService.class, ServiceLoader.load(IOnUnSelectedService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/com/jwebmp/core/events/update/IOnUpdateService.java b/src/main/java/com/jwebmp/core/events/update/IOnUpdateService.java
deleted file mode 100644
index 3b7a1c1a..00000000
--- a/src/main/java/com/jwebmp/core/events/update/IOnUpdateService.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.jwebmp.core.events.update;
-
-import com.jwebmp.core.events.IOnEventServiceBase;
-
-
-public interface IOnUpdateService<J extends IOnUpdateService<J>>
-		extends IOnEventServiceBase<J>
-{
-
-}
diff --git a/src/main/java/com/jwebmp/core/events/update/UpdateAdapter.java b/src/main/java/com/jwebmp/core/events/update/UpdateAdapter.java
index 3f38b438..d605dc87 100644
--- a/src/main/java/com/jwebmp/core/events/update/UpdateAdapter.java
+++ b/src/main/java/com/jwebmp/core/events/update/UpdateAdapter.java
@@ -22,6 +22,7 @@
 import com.jwebmp.core.base.ajax.AjaxResponse;
 import com.jwebmp.core.base.html.interfaces.GlobalFeatures;
 import com.jwebmp.core.base.html.interfaces.events.GlobalEvents;
+import com.jwebmp.core.events.services.IOnUpdateService;
 import com.jwebmp.core.htmlbuilder.javascript.events.enumerations.EventTypes;
 import lombok.extern.java.Log;
 
@@ -82,7 +83,7 @@ public void fireEvent(AjaxCall<?> call, AjaxResponse<?> response)
 	private void onCall()
 	{
 		Set<IOnUpdateService> services = com.guicedee.client.IGuiceContext.instance()
-		            .getLoader(IOnUpdateService.class, ServiceLoader.load(IOnUpdateService.class));
+                                                                          .getLoader(IOnUpdateService.class, ServiceLoader.load(IOnUpdateService.class));
 		services.forEach(service -> service.onCall(this));
 	}
 
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 17533417..6d7fcf3d 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -1,4 +1,5 @@
 import com.guicedee.guicedinjection.interfaces.IGuiceModule;
+import com.jwebmp.core.events.services.*;
 import com.jwebmp.core.implementations.JWebMPSiteBinder;
 import com.jwebmp.core.implementations.JWebMPServicesBindings;
 import com.jwebmp.interception.JWebMPInterceptionBinder;
@@ -6,25 +7,25 @@
 module com.jwebmp.core {
 
     requires static lombok;
-    
+
     requires transitive com.guicedee.client;
     requires transitive com.guicedee.guicedservlets;
     requires transitive jakarta.validation;
     requires transitive jakarta.servlet;
     requires transitive com.google.guice.extensions.servlet;
-  
+
     requires net.sf.uadetector.core;
     requires net.sf.uadetector.resources;
 
     requires aopalliance;
 
     requires com.google.guice;
-    
+
     requires com.guicedee.jsonrepresentation;
 
     requires com.fasterxml.jackson.databind;
     requires com.fasterxml.jackson.core;
-    
+
     requires jakarta.websocket;
     requires jakarta.websocket.client;
 
@@ -32,34 +33,34 @@
     requires org.apache.commons.io;
     requires org.apache.commons.lang3;
     requires org.apache.commons.text;
-	requires com.jwebmp.client;
-	
-	exports com.jwebmp.core;
+    requires com.jwebmp.client;
+
+    exports com.jwebmp.core;
     exports com.jwebmp.core.base;
     //exports com.jwebmp.core.base.ajax;
 
-   // exports com.jwebmp.core.base.client;
-   // exports com.jwebmp.core.services;
+    // exports com.jwebmp.core.base.client;
+    // exports com.jwebmp.core.services;
 
     exports com.jwebmp.core.base.html;
-   // exports com.jwebmp.core.base.html.attributes;
+    // exports com.jwebmp.core.base.html.attributes;
     exports com.jwebmp.core.base.html.inputs;
 
-  //  exports com.jwebmp.core.base.html.interfaces;
-  //  exports com.jwebmp.core.base.html.interfaces.children;
-  //  exports com.jwebmp.core.base.html.interfaces.children.generics;
-  //  exports com.jwebmp.core.base.html.interfaces.events;
+    //  exports com.jwebmp.core.base.html.interfaces;
+    //  exports com.jwebmp.core.base.html.interfaces.children;
+    //  exports com.jwebmp.core.base.html.interfaces.children.generics;
+    //  exports com.jwebmp.core.base.html.interfaces.events;
 
-  //  exports com.jwebmp.core.base.interfaces;
+    //  exports com.jwebmp.core.base.interfaces;
 
     exports com.jwebmp.core.base.page;
 
     exports com.jwebmp.core.base.servlets;
- //   exports com.jwebmp.core.base.servlets.enumarations;
-  //  exports com.jwebmp.core.base.servlets.interfaces;
+    //   exports com.jwebmp.core.base.servlets.enumarations;
+    //  exports com.jwebmp.core.base.servlets.interfaces;
 
     exports com.jwebmp.core.base.servlets.options;
-    exports com.jwebmp.core.databind;
+    //exports com.jwebmp.core.databind;
 
     exports com.jwebmp.core.events.activate;
     exports com.jwebmp.core.events.beforeactivate;
@@ -116,7 +117,7 @@
 
     exports com.jwebmp.core.exceptions;
 
- //   exports com.jwebmp.core.generics;
+    //   exports com.jwebmp.core.generics;
 
     exports com.jwebmp.core.annotations;
 
@@ -128,7 +129,7 @@
     exports com.jwebmp.core.htmlbuilder.css.colours;
     exports com.jwebmp.core.htmlbuilder.css.composer;
     exports com.jwebmp.core.htmlbuilder.css.displays;
- //   exports com.jwebmp.core.htmlbuilder.css.enumarations;
+    //   exports com.jwebmp.core.htmlbuilder.css.enumarations;
     exports com.jwebmp.core.htmlbuilder.css.fonts;
     exports com.jwebmp.core.htmlbuilder.css.heightwidth;
     exports com.jwebmp.core.htmlbuilder.css.image;
@@ -140,15 +141,15 @@
     exports com.jwebmp.core.htmlbuilder.css.padding;
     exports com.jwebmp.core.htmlbuilder.css.tables;
     exports com.jwebmp.core.htmlbuilder.css.text;
-  //  exports com.jwebmp.core.htmlbuilder.css.themes;
+    //  exports com.jwebmp.core.htmlbuilder.css.themes;
 
     exports com.jwebmp.interception.services;
     exports com.jwebmp.interception;
 
-  //  exports com.jwebmp.core.htmlbuilder.javascript;
+    //  exports com.jwebmp.core.htmlbuilder.javascript;
     exports com.jwebmp.core.htmlbuilder.javascript.events.commandevent;
     exports com.jwebmp.core.htmlbuilder.javascript.events.enumerations;
- //   exports com.jwebmp.core.htmlbuilder.javascript.events.interfaces;
+    //   exports com.jwebmp.core.htmlbuilder.javascript.events.interfaces;
 
     exports com.jwebmp.core.plugins;
 
@@ -158,7 +159,7 @@
 
 //	exports com.jwebmp.core.services.scopes;
 
-  //  exports com.jwebmp.core.base.references;
+    //  exports com.jwebmp.core.base.references;
 
     uses com.jwebmp.interception.services.AjaxCallIntercepter;
     uses com.jwebmp.interception.services.DataCallIntercepter;
@@ -177,69 +178,69 @@
     uses com.jwebmp.core.services.RenderAfterDynamicScripts;
     uses com.jwebmp.core.services.RenderBeforeScripts;
 
-    uses com.jwebmp.core.events.activate.IOnActivateService;
-    uses com.jwebmp.core.events.beforeactivate.IOnBeforeActivateService;
-    uses com.jwebmp.core.events.beforeclose.IOnBeforeCloseService;
-    uses com.jwebmp.core.events.beforeload.IOnBeforeLoadService;
-    uses com.jwebmp.core.events.blur.IOnBlurService;
-    uses com.jwebmp.core.events.beforestop.IOnBeforeStopService;
-    uses com.jwebmp.core.events.buttonclick.IOnButtonClickService;
-    uses com.jwebmp.core.events.cancel.IOnCancelService;
-    uses com.jwebmp.core.events.change.IOnChangeService;
-    uses com.jwebmp.core.events.checked.IOnCheckedService;
-    uses com.jwebmp.core.events.close.IOnCloseService;
-    uses com.jwebmp.core.events.click.IOnClickService;
-    uses com.jwebmp.core.events.complete.IOnCompleteService;
-    uses com.jwebmp.core.events.create.IOnCreateService;
-    uses com.jwebmp.core.events.deactivate.IOnDeActivateService;
-    uses com.jwebmp.core.events.drag.IOnDragService;
-    uses com.jwebmp.core.events.dragstart.IOnDragStartService;
-    uses com.jwebmp.core.events.dragstop.IOnDragStopService;
-    uses com.jwebmp.core.events.drop.IOnDropService;
-    uses com.jwebmp.core.events.dropover.IOnDropOverService;
-    uses com.jwebmp.core.events.focus.IOnFocusService;
-    uses com.jwebmp.core.events.keydown.IOnKeyDownService;
-    uses com.jwebmp.core.events.keypressed.IOnKeyPressedService;
-    uses com.jwebmp.core.events.keyup.IOnKeyUpService;
-    uses com.jwebmp.core.events.load.IOnLoadService;
-    uses com.jwebmp.core.events.mouseenter.IOnMouseEnterService;
-    uses com.jwebmp.core.events.mousemove.IOnMouseMoveService;
-    uses com.jwebmp.core.events.mouseout.IOnMouseOutService;
-    uses com.jwebmp.core.events.mouseover.IOnMouseOverService;
-    uses com.jwebmp.core.events.mouseup.IOnMouseUpService;
-    uses com.jwebmp.core.events.open.IOnOpenService;
-    uses com.jwebmp.core.events.receive.IOnReceiveService;
-    uses com.jwebmp.core.events.remove.IOnRemoveService;
-    uses com.jwebmp.core.events.resize.IOnResizeService;
-    uses com.jwebmp.core.events.resizestop.IOnResizeStopService;
-    uses com.jwebmp.core.events.response.IOnResponseService;
-    uses com.jwebmp.core.events.rightclick.IOnRightClickService;
-    uses com.jwebmp.core.events.select.IOnSelectService;
-    uses com.jwebmp.core.events.search.IOnSearchService;
-    uses com.jwebmp.core.events.selected.IOnSelectedService;
-    uses com.jwebmp.core.events.selecting.IOnSelectingService;
-    uses com.jwebmp.core.events.slide.IOnSlideService;
-    uses com.jwebmp.core.events.sort.IOnSortService;
-    uses com.jwebmp.core.events.spin.IOnSpinService;
-    uses com.jwebmp.core.events.start.IOnStartService;
-    uses com.jwebmp.core.events.stop.IOnStopService;
-    uses com.jwebmp.core.events.submit.IOnSubmitService;
-    uses com.jwebmp.core.events.unselected.IOnUnSelectedService;
-    uses com.jwebmp.core.events.update.IOnUpdateService;
+    uses IOnActivateService;
+    uses IOnBeforeActivateService;
+    uses IOnBeforeCloseService;
+    uses IOnBeforeLoadService;
+    uses IOnBlurService;
+    uses IOnBeforeStopService;
+    uses IOnButtonClickService;
+    uses IOnCancelService;
+    uses IOnChangeService;
+    uses IOnCheckedService;
+    uses IOnCloseService;
+    uses IOnClickService;
+    uses IOnCompleteService;
+    uses IOnCreateService;
+    uses IOnDeActivateService;
+    uses IOnDragService;
+    uses IOnDragStartService;
+    uses IOnDragStopService;
+    uses IOnDropService;
+    uses IOnDropOverService;
+    uses IOnFocusService;
+    uses IOnKeyDownService;
+    uses IOnKeyPressedService;
+    uses IOnKeyUpService;
+    uses IOnLoadService;
+    uses IOnMouseEnterService;
+    uses IOnMouseMoveService;
+    uses IOnMouseOutService;
+    uses IOnMouseOverService;
+    uses IOnMouseUpService;
+    uses IOnOpenService;
+    uses IOnReceiveService;
+    uses IOnRemoveService;
+    uses IOnResizeService;
+    uses IOnResizeStopService;
+    uses IOnResponseService;
+    uses IOnRightClickService;
+    uses IOnSelectService;
+    uses IOnSearchService;
+    uses IOnSelectedService;
+    uses IOnSelectingService;
+    uses IOnSlideService;
+    uses IOnSortService;
+    uses IOnSpinService;
+    uses IOnStartService;
+    uses IOnStopService;
+    uses IOnSubmitService;
+    uses IOnUnSelectedService;
+    uses IOnUpdateService;
     uses com.jwebmp.core.databind.IOnDataBind;
     uses com.jwebmp.core.databind.IOnDataBindCloak;
 
     uses com.jwebmp.core.services.IDynamicRenderingServlet;
-    uses com.jwebmp.core.events.dropout.IOnDropOutService;
-    uses com.jwebmp.core.events.mousedown.IOnMouseDownService;
-    uses com.jwebmp.core.events.resizestart.IOnResizeStartService;
+    uses IOnDropOutService;
+    uses IOnMouseDownService;
+    uses IOnResizeStartService;
     uses com.jwebmp.core.events.IEventConfigurator;
     uses com.jwebmp.core.databind.IOnComponentHtmlRender;
     uses com.jwebmp.core.databind.IOnComponentAdded;
 
-    
+
     provides IGuiceModule with JWebMPServicesBindings, JWebMPInterceptionBinder, JWebMPSiteBinder;
-    
+
     provides com.guicedee.guicedinjection.interfaces.IGuiceScanModuleInclusions with com.jwebmp.core.implementations.JWebMPModuleInclusions;
 
     provides com.jwebmp.core.services.IDynamicRenderingServlet with com.jwebmp.core.implementations.JWebMPDynamicScriptRenderer, com.jwebmp.core.implementations.JWebMPJavaScriptDynamicScriptRenderer;
@@ -251,9 +252,9 @@
     opens com.jwebmp.core.base.servlets to com.google.guice, com.fasterxml.jackson.databind;
 
     opens com.jwebmp.core.base.page to com.google.guice;
-  //  opens com.jwebmp.core.base.ajax to com.fasterxml.jackson.databind;
+    //  opens com.jwebmp.core.base.ajax to com.fasterxml.jackson.databind;
     opens com.jwebmp.core.base.html to com.fasterxml.jackson.databind;
-  //  opens com.jwebmp.core.htmlbuilder.javascript to com.fasterxml.jackson.databind;
+    //  opens com.jwebmp.core.htmlbuilder.javascript to com.fasterxml.jackson.databind;
     opens com.jwebmp.core.base to com.fasterxml.jackson.databind;
 
     opens com.jwebmp.core to com.google.guice, com.fasterxml.jackson.databind;
@@ -269,7 +270,7 @@
     opens com.jwebmp.core.htmlbuilder.css.colours to com.fasterxml.jackson.databind;
     opens com.jwebmp.core.htmlbuilder.css.composer to com.fasterxml.jackson.databind;
     opens com.jwebmp.core.htmlbuilder.css.displays to com.fasterxml.jackson.databind;
-   // opens com.jwebmp.core.htmlbuilder.css.enumarations to com.fasterxml.jackson.databind;
+    // opens com.jwebmp.core.htmlbuilder.css.enumarations to com.fasterxml.jackson.databind;
     opens com.jwebmp.core.htmlbuilder.css.fonts to com.fasterxml.jackson.databind;
     opens com.jwebmp.core.htmlbuilder.css.heightwidth to com.fasterxml.jackson.databind;
     opens com.jwebmp.core.htmlbuilder.css.image to com.fasterxml.jackson.databind;
@@ -280,11 +281,11 @@
     opens com.jwebmp.core.htmlbuilder.css.padding to com.fasterxml.jackson.databind;
     opens com.jwebmp.core.htmlbuilder.css.tables to com.fasterxml.jackson.databind;
     opens com.jwebmp.core.htmlbuilder.css.text to com.fasterxml.jackson.databind;
-  //  opens com.jwebmp.core.htmlbuilder.css.themes to com.fasterxml.jackson.databind;
+    //  opens com.jwebmp.core.htmlbuilder.css.themes to com.fasterxml.jackson.databind;
 
-  //  opens com.jwebmp.core.base.client to com.fasterxml.jackson.databind;
+    //  opens com.jwebmp.core.base.client to com.fasterxml.jackson.databind;
 
-  //  opens com.jwebmp.core.base.servlets.interfaces to com.fasterxml.jackson.databind;
+    //  opens com.jwebmp.core.base.servlets.interfaces to com.fasterxml.jackson.databind;
     opens com.jwebmp.core.base.servlets.options to com.fasterxml.jackson.databind;
 
     opens com.jwebmp.core.utilities.regex to com.fasterxml.jackson.databind;
diff --git a/src/test/java/com/jwebmp/implementations/InstanceManagementPageTest.java b/src/test/java/com/jwebmp/implementations/InstanceManagementPageTest.java
index 6e408558..231a34c1 100644
--- a/src/test/java/com/jwebmp/implementations/InstanceManagementPageTest.java
+++ b/src/test/java/com/jwebmp/implementations/InstanceManagementPageTest.java
@@ -23,9 +23,9 @@ public void destroy(BaseTest testInstance)
     {
         if (BaseTestClass.class.isAssignableFrom(testInstance.getClass()))
         {
-            BaseTestClass.class.cast(testInstance)
-                               .getInstance()
-                               .destroy();
+            ((BaseTestClass) testInstance)
+                    .getInstance()
+                    .destroy();
         }
         IGuiceContext.instance()
                      .destroy();