diff --git a/esl-client-bbb/.gitignore b/bbb-fsesl-client/.gitignore
similarity index 100%
rename from esl-client-bbb/.gitignore
rename to bbb-fsesl-client/.gitignore
diff --git a/esl-client-bbb/build.gradle b/bbb-fsesl-client/build.gradle
similarity index 100%
rename from esl-client-bbb/build.gradle
rename to bbb-fsesl-client/build.gradle
diff --git a/esl-client-bbb/esl-client-bbb.patch b/bbb-fsesl-client/esl-client-bbb.patch
similarity index 100%
rename from esl-client-bbb/esl-client-bbb.patch
rename to bbb-fsesl-client/esl-client-bbb.patch
diff --git a/esl-client-bbb/org.freeswitch.esl.client.example/.classpath b/bbb-fsesl-client/org.freeswitch.esl.client.example/.classpath
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client.example/.classpath
rename to bbb-fsesl-client/org.freeswitch.esl.client.example/.classpath
diff --git a/esl-client-bbb/org.freeswitch.esl.client.example/.project b/bbb-fsesl-client/org.freeswitch.esl.client.example/.project
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client.example/.project
rename to bbb-fsesl-client/org.freeswitch.esl.client.example/.project
diff --git a/esl-client-bbb/org.freeswitch.esl.client.example/.settings/org.eclipse.jdt.core.prefs b/bbb-fsesl-client/org.freeswitch.esl.client.example/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client.example/.settings/org.eclipse.jdt.core.prefs
rename to bbb-fsesl-client/org.freeswitch.esl.client.example/.settings/org.eclipse.jdt.core.prefs
diff --git a/esl-client-bbb/org.freeswitch.esl.client.example/.settings/org.maven.ide.eclipse.prefs b/bbb-fsesl-client/org.freeswitch.esl.client.example/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client.example/.settings/org.maven.ide.eclipse.prefs
rename to bbb-fsesl-client/org.freeswitch.esl.client.example/.settings/org.maven.ide.eclipse.prefs
diff --git a/esl-client-bbb/org.freeswitch.esl.client.example/esl_client.log b/bbb-fsesl-client/org.freeswitch.esl.client.example/esl_client.log
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client.example/esl_client.log
rename to bbb-fsesl-client/org.freeswitch.esl.client.example/esl_client.log
diff --git a/esl-client-bbb/org.freeswitch.esl.client.example/esl_client.log.1 b/bbb-fsesl-client/org.freeswitch.esl.client.example/esl_client.log.1
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client.example/esl_client.log.1
rename to bbb-fsesl-client/org.freeswitch.esl.client.example/esl_client.log.1
diff --git a/esl-client-bbb/org.freeswitch.esl.client.example/pom.xml b/bbb-fsesl-client/org.freeswitch.esl.client.example/pom.xml
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client.example/pom.xml
rename to bbb-fsesl-client/org.freeswitch.esl.client.example/pom.xml
diff --git a/esl-client-bbb/org.freeswitch.esl.client.example/src/main/java/org/freeswitch/esl/client/example/EslEventListener.java b/bbb-fsesl-client/org.freeswitch.esl.client.example/src/main/java/org/freeswitch/esl/client/example/EslEventListener.java
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client.example/src/main/java/org/freeswitch/esl/client/example/EslEventListener.java
rename to bbb-fsesl-client/org.freeswitch.esl.client.example/src/main/java/org/freeswitch/esl/client/example/EslEventListener.java
diff --git a/esl-client-bbb/org.freeswitch.esl.client.example/src/main/java/org/freeswitch/esl/client/example/ExampleClient.java b/bbb-fsesl-client/org.freeswitch.esl.client.example/src/main/java/org/freeswitch/esl/client/example/ExampleClient.java
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client.example/src/main/java/org/freeswitch/esl/client/example/ExampleClient.java
rename to bbb-fsesl-client/org.freeswitch.esl.client.example/src/main/java/org/freeswitch/esl/client/example/ExampleClient.java
diff --git a/esl-client-bbb/org.freeswitch.esl.client.example/src/main/java/org/freeswitch/esl/client/example/HeartbeatThread.java b/bbb-fsesl-client/org.freeswitch.esl.client.example/src/main/java/org/freeswitch/esl/client/example/HeartbeatThread.java
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client.example/src/main/java/org/freeswitch/esl/client/example/HeartbeatThread.java
rename to bbb-fsesl-client/org.freeswitch.esl.client.example/src/main/java/org/freeswitch/esl/client/example/HeartbeatThread.java
diff --git a/esl-client-bbb/org.freeswitch.esl.client.example/src/main/resources/log4j.properties b/bbb-fsesl-client/org.freeswitch.esl.client.example/src/main/resources/log4j.properties
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client.example/src/main/resources/log4j.properties
rename to bbb-fsesl-client/org.freeswitch.esl.client.example/src/main/resources/log4j.properties
diff --git a/esl-client-bbb/org.freeswitch.esl.client.example/target/maven-archiver/pom.properties b/bbb-fsesl-client/org.freeswitch.esl.client.example/target/maven-archiver/pom.properties
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client.example/target/maven-archiver/pom.properties
rename to bbb-fsesl-client/org.freeswitch.esl.client.example/target/maven-archiver/pom.properties
diff --git a/esl-client-bbb/org.freeswitch.esl.client.example/target/org.freeswitch.esl.client.example-0.9.0-SNAPSHOT-sources.jar b/bbb-fsesl-client/org.freeswitch.esl.client.example/target/org.freeswitch.esl.client.example-0.9.0-SNAPSHOT-sources.jar
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client.example/target/org.freeswitch.esl.client.example-0.9.0-SNAPSHOT-sources.jar
rename to bbb-fsesl-client/org.freeswitch.esl.client.example/target/org.freeswitch.esl.client.example-0.9.0-SNAPSHOT-sources.jar
diff --git a/esl-client-bbb/org.freeswitch.esl.client.example/target/org.freeswitch.esl.client.example-0.9.0-SNAPSHOT.jar b/bbb-fsesl-client/org.freeswitch.esl.client.example/target/org.freeswitch.esl.client.example-0.9.0-SNAPSHOT.jar
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client.example/target/org.freeswitch.esl.client.example-0.9.0-SNAPSHOT.jar
rename to bbb-fsesl-client/org.freeswitch.esl.client.example/target/org.freeswitch.esl.client.example-0.9.0-SNAPSHOT.jar
diff --git a/esl-client-bbb/org.freeswitch.esl.client/.classpath b/bbb-fsesl-client/org.freeswitch.esl.client/.classpath
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client/.classpath
rename to bbb-fsesl-client/org.freeswitch.esl.client/.classpath
diff --git a/esl-client-bbb/org.freeswitch.esl.client/.project b/bbb-fsesl-client/org.freeswitch.esl.client/.project
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client/.project
rename to bbb-fsesl-client/org.freeswitch.esl.client/.project
diff --git a/esl-client-bbb/org.freeswitch.esl.client/.settings/org.eclipse.jdt.core.prefs b/bbb-fsesl-client/org.freeswitch.esl.client/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client/.settings/org.eclipse.jdt.core.prefs
rename to bbb-fsesl-client/org.freeswitch.esl.client/.settings/org.eclipse.jdt.core.prefs
diff --git a/esl-client-bbb/org.freeswitch.esl.client/.settings/org.maven.ide.eclipse.prefs b/bbb-fsesl-client/org.freeswitch.esl.client/.settings/org.maven.ide.eclipse.prefs
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client/.settings/org.maven.ide.eclipse.prefs
rename to bbb-fsesl-client/org.freeswitch.esl.client/.settings/org.maven.ide.eclipse.prefs
diff --git a/esl-client-bbb/org.freeswitch.esl.client/TODO.txt b/bbb-fsesl-client/org.freeswitch.esl.client/TODO.txt
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client/TODO.txt
rename to bbb-fsesl-client/org.freeswitch.esl.client/TODO.txt
diff --git a/esl-client-bbb/org.freeswitch.esl.client/build.gradle b/bbb-fsesl-client/org.freeswitch.esl.client/build.gradle
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client/build.gradle
rename to bbb-fsesl-client/org.freeswitch.esl.client/build.gradle
diff --git a/esl-client-bbb/org.freeswitch.esl.client/pom.xml b/bbb-fsesl-client/org.freeswitch.esl.client/pom.xml
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client/pom.xml
rename to bbb-fsesl-client/org.freeswitch.esl.client/pom.xml
diff --git a/esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/IEslEventListener.java b/bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/IEslEventListener.java
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/IEslEventListener.java
rename to bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/IEslEventListener.java
diff --git a/esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/inbound/Client.java b/bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/inbound/Client.java
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/inbound/Client.java
rename to bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/inbound/Client.java
diff --git a/esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/inbound/InboundClientHandler.java b/bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/inbound/InboundClientHandler.java
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/inbound/InboundClientHandler.java
rename to bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/inbound/InboundClientHandler.java
diff --git a/esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/inbound/InboundConnectionFailure.java b/bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/inbound/InboundConnectionFailure.java
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/inbound/InboundConnectionFailure.java
rename to bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/inbound/InboundConnectionFailure.java
diff --git a/esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/inbound/InboundPipelineFactory.java b/bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/inbound/InboundPipelineFactory.java
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/inbound/InboundPipelineFactory.java
rename to bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/inbound/InboundPipelineFactory.java
diff --git a/esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/AbstractEslClientHandler.java b/bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/AbstractEslClientHandler.java
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/AbstractEslClientHandler.java
rename to bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/AbstractEslClientHandler.java
diff --git a/esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/HeaderParser.java b/bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/HeaderParser.java
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/HeaderParser.java
rename to bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/HeaderParser.java
diff --git a/esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/IEslProtocolListener.java b/bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/IEslProtocolListener.java
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/IEslProtocolListener.java
rename to bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/IEslProtocolListener.java
diff --git a/esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/debug/ChannelEventRunnable.java b/bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/debug/ChannelEventRunnable.java
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/debug/ChannelEventRunnable.java
rename to bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/debug/ChannelEventRunnable.java
diff --git a/esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/debug/ExecutionHandler.java b/bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/debug/ExecutionHandler.java
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/debug/ExecutionHandler.java
rename to bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/internal/debug/ExecutionHandler.java
diff --git a/esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/manager/DefaultManagerConnection.java b/bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/manager/DefaultManagerConnection.java
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/manager/DefaultManagerConnection.java
rename to bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/manager/DefaultManagerConnection.java
diff --git a/esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/manager/ManagerConnection.java b/bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/manager/ManagerConnection.java
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/manager/ManagerConnection.java
rename to bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/manager/ManagerConnection.java
diff --git a/esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/manager/internal/ManagerConnectionImpl.java b/bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/manager/internal/ManagerConnectionImpl.java
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/manager/internal/ManagerConnectionImpl.java
rename to bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/manager/internal/ManagerConnectionImpl.java
diff --git a/esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/AbstractOutboundClientHandler.java b/bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/AbstractOutboundClientHandler.java
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/AbstractOutboundClientHandler.java
rename to bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/AbstractOutboundClientHandler.java
diff --git a/esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/AbstractOutboundPipelineFactory.java b/bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/AbstractOutboundPipelineFactory.java
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/AbstractOutboundPipelineFactory.java
rename to bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/AbstractOutboundPipelineFactory.java
diff --git a/esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/SocketClient.java b/bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/SocketClient.java
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/SocketClient.java
rename to bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/SocketClient.java
diff --git a/esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/example/SimpleHangupOutboundHandler.java b/bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/example/SimpleHangupOutboundHandler.java
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/example/SimpleHangupOutboundHandler.java
rename to bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/example/SimpleHangupOutboundHandler.java
diff --git a/esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/example/SimpleHangupPipelineFactory.java b/bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/example/SimpleHangupPipelineFactory.java
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/example/SimpleHangupPipelineFactory.java
rename to bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/outbound/example/SimpleHangupPipelineFactory.java
diff --git a/esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/CommandResponse.java b/bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/CommandResponse.java
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/CommandResponse.java
rename to bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/CommandResponse.java
diff --git a/esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/SendMsg.java b/bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/SendMsg.java
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/SendMsg.java
rename to bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/SendMsg.java
diff --git a/esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/event/EslEvent.java b/bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/event/EslEvent.java
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/event/EslEvent.java
rename to bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/event/EslEvent.java
diff --git a/esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/event/EslEventHeaderNames.java b/bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/event/EslEventHeaderNames.java
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/event/EslEventHeaderNames.java
rename to bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/event/EslEventHeaderNames.java
diff --git a/esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/message/EslFrameDecoder.java b/bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/message/EslFrameDecoder.java
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/message/EslFrameDecoder.java
rename to bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/message/EslFrameDecoder.java
diff --git a/esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/message/EslHeaders.java b/bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/message/EslHeaders.java
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/message/EslHeaders.java
rename to bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/message/EslHeaders.java
diff --git a/esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/message/EslMessage.java b/bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/message/EslMessage.java
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/message/EslMessage.java
rename to bbb-fsesl-client/org.freeswitch.esl.client/src/main/java/org/freeswitch/esl/client/transport/message/EslMessage.java
diff --git a/esl-client-bbb/org.freeswitch.esl.client/src/test/java/org/freeswitch/esl/client/inbound/ClientTest.java b/bbb-fsesl-client/org.freeswitch.esl.client/src/test/java/org/freeswitch/esl/client/inbound/ClientTest.java
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client/src/test/java/org/freeswitch/esl/client/inbound/ClientTest.java
rename to bbb-fsesl-client/org.freeswitch.esl.client/src/test/java/org/freeswitch/esl/client/inbound/ClientTest.java
diff --git a/esl-client-bbb/org.freeswitch.esl.client/src/test/java/org/freeswitch/esl/client/outbound/SocketClientTest.java b/bbb-fsesl-client/org.freeswitch.esl.client/src/test/java/org/freeswitch/esl/client/outbound/SocketClientTest.java
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client/src/test/java/org/freeswitch/esl/client/outbound/SocketClientTest.java
rename to bbb-fsesl-client/org.freeswitch.esl.client/src/test/java/org/freeswitch/esl/client/outbound/SocketClientTest.java
diff --git a/esl-client-bbb/org.freeswitch.esl.client/src/test/java/org/freeswitch/esl/client/transport/message/EslFrameDecoderTest.java b/bbb-fsesl-client/org.freeswitch.esl.client/src/test/java/org/freeswitch/esl/client/transport/message/EslFrameDecoderTest.java
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client/src/test/java/org/freeswitch/esl/client/transport/message/EslFrameDecoderTest.java
rename to bbb-fsesl-client/org.freeswitch.esl.client/src/test/java/org/freeswitch/esl/client/transport/message/EslFrameDecoderTest.java
diff --git a/esl-client-bbb/org.freeswitch.esl.client/src/test/resources/logback-test.xml b/bbb-fsesl-client/org.freeswitch.esl.client/src/test/resources/logback-test.xml
similarity index 100%
rename from esl-client-bbb/org.freeswitch.esl.client/src/test/resources/logback-test.xml
rename to bbb-fsesl-client/org.freeswitch.esl.client/src/test/resources/logback-test.xml
diff --git a/esl-client-bbb/pom.xml b/bbb-fsesl-client/pom.xml
similarity index 100%
rename from esl-client-bbb/pom.xml
rename to bbb-fsesl-client/pom.xml