diff --git a/log4j.properties b/spring-integration-smb/log4j.properties
similarity index 100%
rename from log4j.properties
rename to spring-integration-smb/log4j.properties
diff --git a/pom.xml b/spring-integration-smb/pom.xml
similarity index 100%
rename from pom.xml
rename to spring-integration-smb/pom.xml
diff --git a/src/main/java/org/springframework/integration/smb/config/SmbInboundChannelAdapterParser.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/config/SmbInboundChannelAdapterParser.java
similarity index 100%
rename from src/main/java/org/springframework/integration/smb/config/SmbInboundChannelAdapterParser.java
rename to spring-integration-smb/src/main/java/org/springframework/integration/smb/config/SmbInboundChannelAdapterParser.java
diff --git a/src/main/java/org/springframework/integration/smb/config/SmbNamespaceHandler.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/config/SmbNamespaceHandler.java
similarity index 100%
rename from src/main/java/org/springframework/integration/smb/config/SmbNamespaceHandler.java
rename to spring-integration-smb/src/main/java/org/springframework/integration/smb/config/SmbNamespaceHandler.java
diff --git a/src/main/java/org/springframework/integration/smb/filters/SmbRegexPatternFileListFilter.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbRegexPatternFileListFilter.java
similarity index 100%
rename from src/main/java/org/springframework/integration/smb/filters/SmbRegexPatternFileListFilter.java
rename to spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbRegexPatternFileListFilter.java
diff --git a/src/main/java/org/springframework/integration/smb/filters/SmbSimplePatternFileListFilter.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbSimplePatternFileListFilter.java
similarity index 100%
rename from src/main/java/org/springframework/integration/smb/filters/SmbSimplePatternFileListFilter.java
rename to spring-integration-smb/src/main/java/org/springframework/integration/smb/filters/SmbSimplePatternFileListFilter.java
diff --git a/src/main/java/org/springframework/integration/smb/inbound/SmbInboundFileSynchronizer.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/inbound/SmbInboundFileSynchronizer.java
similarity index 100%
rename from src/main/java/org/springframework/integration/smb/inbound/SmbInboundFileSynchronizer.java
rename to spring-integration-smb/src/main/java/org/springframework/integration/smb/inbound/SmbInboundFileSynchronizer.java
diff --git a/src/main/java/org/springframework/integration/smb/inbound/SmbInboundFileSynchronizingMessageSource.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/inbound/SmbInboundFileSynchronizingMessageSource.java
similarity index 100%
rename from src/main/java/org/springframework/integration/smb/inbound/SmbInboundFileSynchronizingMessageSource.java
rename to spring-integration-smb/src/main/java/org/springframework/integration/smb/inbound/SmbInboundFileSynchronizingMessageSource.java
diff --git a/src/main/java/org/springframework/integration/smb/session/SmbConfig.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbConfig.java
similarity index 100%
rename from src/main/java/org/springframework/integration/smb/session/SmbConfig.java
rename to spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbConfig.java
diff --git a/src/main/java/org/springframework/integration/smb/session/SmbSession.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbSession.java
similarity index 100%
rename from src/main/java/org/springframework/integration/smb/session/SmbSession.java
rename to spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbSession.java
diff --git a/src/main/java/org/springframework/integration/smb/session/SmbSessionFactory.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbSessionFactory.java
similarity index 100%
rename from src/main/java/org/springframework/integration/smb/session/SmbSessionFactory.java
rename to spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbSessionFactory.java
diff --git a/src/main/java/org/springframework/integration/smb/session/SmbShare.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbShare.java
similarity index 100%
rename from src/main/java/org/springframework/integration/smb/session/SmbShare.java
rename to spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbShare.java
diff --git a/src/main/java/org/springframework/integration/smb/session/SmbUtils.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbUtils.java
similarity index 100%
rename from src/main/java/org/springframework/integration/smb/session/SmbUtils.java
rename to spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbUtils.java
diff --git a/src/main/resources/META-INF/spring.handlers b/spring-integration-smb/src/main/resources/META-INF/spring.handlers
similarity index 100%
rename from src/main/resources/META-INF/spring.handlers
rename to spring-integration-smb/src/main/resources/META-INF/spring.handlers
diff --git a/src/main/resources/META-INF/spring.schemas b/spring-integration-smb/src/main/resources/META-INF/spring.schemas
similarity index 100%
rename from src/main/resources/META-INF/spring.schemas
rename to spring-integration-smb/src/main/resources/META-INF/spring.schemas
diff --git a/src/main/resources/META-INF/spring.tooling b/spring-integration-smb/src/main/resources/META-INF/spring.tooling
similarity index 100%
rename from src/main/resources/META-INF/spring.tooling
rename to spring-integration-smb/src/main/resources/META-INF/spring.tooling
diff --git a/src/main/resources/license_header.txt b/spring-integration-smb/src/main/resources/license_header.txt
similarity index 100%
rename from src/main/resources/license_header.txt
rename to spring-integration-smb/src/main/resources/license_header.txt
diff --git a/src/main/resources/org/springframework/integration/smb/config/spring-integration-smb-2.0.xsd b/spring-integration-smb/src/main/resources/org/springframework/integration/smb/config/spring-integration-smb-2.0.xsd
similarity index 100%
rename from src/main/resources/org/springframework/integration/smb/config/spring-integration-smb-2.0.xsd
rename to spring-integration-smb/src/main/resources/org/springframework/integration/smb/config/spring-integration-smb-2.0.xsd
diff --git a/src/main/resources/org/springframework/integration/smb/config/spring-integration-smb.gif b/spring-integration-smb/src/main/resources/org/springframework/integration/smb/config/spring-integration-smb.gif
similarity index 100%
rename from src/main/resources/org/springframework/integration/smb/config/spring-integration-smb.gif
rename to spring-integration-smb/src/main/resources/org/springframework/integration/smb/config/spring-integration-smb.gif
diff --git a/src/test/java/org/springframework/integration/smb/AbstractBaseTest.java b/spring-integration-smb/src/test/java/org/springframework/integration/smb/AbstractBaseTest.java
similarity index 100%
rename from src/test/java/org/springframework/integration/smb/AbstractBaseTest.java
rename to spring-integration-smb/src/test/java/org/springframework/integration/smb/AbstractBaseTest.java
diff --git a/src/test/java/org/springframework/integration/smb/SmbMessageHistoryTests-context.xml b/spring-integration-smb/src/test/java/org/springframework/integration/smb/SmbMessageHistoryTests-context.xml
similarity index 100%
rename from src/test/java/org/springframework/integration/smb/SmbMessageHistoryTests-context.xml
rename to spring-integration-smb/src/test/java/org/springframework/integration/smb/SmbMessageHistoryTests-context.xml
diff --git a/src/test/java/org/springframework/integration/smb/SmbMessageHistoryTests.java b/spring-integration-smb/src/test/java/org/springframework/integration/smb/SmbMessageHistoryTests.java
similarity index 100%
rename from src/test/java/org/springframework/integration/smb/SmbMessageHistoryTests.java
rename to spring-integration-smb/src/test/java/org/springframework/integration/smb/SmbMessageHistoryTests.java
diff --git a/src/test/java/org/springframework/integration/smb/SmbParserInboundTests-context.xml b/spring-integration-smb/src/test/java/org/springframework/integration/smb/SmbParserInboundTests-context.xml
similarity index 100%
rename from src/test/java/org/springframework/integration/smb/SmbParserInboundTests-context.xml
rename to spring-integration-smb/src/test/java/org/springframework/integration/smb/SmbParserInboundTests-context.xml
diff --git a/src/test/java/org/springframework/integration/smb/SmbParserInboundTests-fail-context.xml b/spring-integration-smb/src/test/java/org/springframework/integration/smb/SmbParserInboundTests-fail-context.xml
similarity index 100%
rename from src/test/java/org/springframework/integration/smb/SmbParserInboundTests-fail-context.xml
rename to spring-integration-smb/src/test/java/org/springframework/integration/smb/SmbParserInboundTests-fail-context.xml
diff --git a/src/test/java/org/springframework/integration/smb/SmbParserInboundTests.java b/spring-integration-smb/src/test/java/org/springframework/integration/smb/SmbParserInboundTests.java
similarity index 100%
rename from src/test/java/org/springframework/integration/smb/SmbParserInboundTests.java
rename to spring-integration-smb/src/test/java/org/springframework/integration/smb/SmbParserInboundTests.java
diff --git a/src/test/java/org/springframework/integration/smb/config/SmbInboundChannelAdapterParserTests-context.xml b/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbInboundChannelAdapterParserTests-context.xml
similarity index 100%
rename from src/test/java/org/springframework/integration/smb/config/SmbInboundChannelAdapterParserTests-context.xml
rename to spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbInboundChannelAdapterParserTests-context.xml
diff --git a/src/test/java/org/springframework/integration/smb/config/SmbInboundChannelAdapterParserTests.java b/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbInboundChannelAdapterParserTests.java
similarity index 100%
rename from src/test/java/org/springframework/integration/smb/config/SmbInboundChannelAdapterParserTests.java
rename to spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbInboundChannelAdapterParserTests.java
diff --git a/src/test/java/org/springframework/integration/smb/config/SmbInboundChannelAdapterSample-context.xml b/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbInboundChannelAdapterSample-context.xml
similarity index 100%
rename from src/test/java/org/springframework/integration/smb/config/SmbInboundChannelAdapterSample-context.xml
rename to spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbInboundChannelAdapterSample-context.xml
diff --git a/src/test/java/org/springframework/integration/smb/config/SmbInboundOutboundSample.java b/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbInboundOutboundSample.java
similarity index 100%
rename from src/test/java/org/springframework/integration/smb/config/SmbInboundOutboundSample.java
rename to spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbInboundOutboundSample.java
diff --git a/src/test/java/org/springframework/integration/smb/config/SmbOutboundChannelAdapterParserTests-context.xml b/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbOutboundChannelAdapterParserTests-context.xml
similarity index 100%
rename from src/test/java/org/springframework/integration/smb/config/SmbOutboundChannelAdapterParserTests-context.xml
rename to spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbOutboundChannelAdapterParserTests-context.xml
diff --git a/src/test/java/org/springframework/integration/smb/config/SmbOutboundChannelAdapterParserTests.java b/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbOutboundChannelAdapterParserTests.java
similarity index 100%
rename from src/test/java/org/springframework/integration/smb/config/SmbOutboundChannelAdapterParserTests.java
rename to spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbOutboundChannelAdapterParserTests.java
diff --git a/src/test/java/org/springframework/integration/smb/config/SmbOutboundChannelAdapterSample-context.xml b/spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbOutboundChannelAdapterSample-context.xml
similarity index 100%
rename from src/test/java/org/springframework/integration/smb/config/SmbOutboundChannelAdapterSample-context.xml
rename to spring-integration-smb/src/test/java/org/springframework/integration/smb/config/SmbOutboundChannelAdapterSample-context.xml
diff --git a/src/test/java/org/springframework/integration/smb/inbound/SmbInboundRemoteFileSystemSynchronizerTest.java b/spring-integration-smb/src/test/java/org/springframework/integration/smb/inbound/SmbInboundRemoteFileSystemSynchronizerTest.java
similarity index 100%
rename from src/test/java/org/springframework/integration/smb/inbound/SmbInboundRemoteFileSystemSynchronizerTest.java
rename to spring-integration-smb/src/test/java/org/springframework/integration/smb/inbound/SmbInboundRemoteFileSystemSynchronizerTest.java
diff --git a/src/test/java/org/springframework/integration/smb/outbound/SmbSendingMessageHandlerTest.java b/spring-integration-smb/src/test/java/org/springframework/integration/smb/outbound/SmbSendingMessageHandlerTest.java
similarity index 100%
rename from src/test/java/org/springframework/integration/smb/outbound/SmbSendingMessageHandlerTest.java
rename to spring-integration-smb/src/test/java/org/springframework/integration/smb/outbound/SmbSendingMessageHandlerTest.java
diff --git a/src/test/java/org/springframework/integration/smb/session/MySmbSessionTest.java b/spring-integration-smb/src/test/java/org/springframework/integration/smb/session/MySmbSessionTest.java
similarity index 100%
rename from src/test/java/org/springframework/integration/smb/session/MySmbSessionTest.java
rename to spring-integration-smb/src/test/java/org/springframework/integration/smb/session/MySmbSessionTest.java
diff --git a/src/test/resources/log4j.properties b/spring-integration-smb/src/test/resources/log4j.properties
similarity index 100%
rename from src/test/resources/log4j.properties
rename to spring-integration-smb/src/test/resources/log4j.properties
diff --git a/template.mf b/spring-integration-smb/template.mf
similarity index 100%
rename from template.mf
rename to spring-integration-smb/template.mf