diff --git a/pom.xml b/pom.xml
index 6a83fe026e..5526c1e2a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,12 +90,13 @@
         <module>spring-hibernate3</module>
         <module>spring-hibernate4</module>
         <module>spring-jpa</module>
+        <module>spring-jms</module>
         <module>spring-katharsis</module>
         <module>spring-mockito</module>
         <module>spring-mvc-java</module>
         <module>spring-mvc-no-xml</module>
         <module>spring-mvc-xml</module>
-	<module>spring-mvc-tiles</module>
+        <module>spring-mvc-tiles</module>
         <module>spring-openid</module>
         <module>spring-protobuf</module>
         <module>spring-quartz</module>
diff --git a/spring-jms/src/com/baeldung/spring/jms/Employee.java b/spring-jms/src/main/java/com/baeldung/spring/jms/Employee.java
similarity index 94%
rename from spring-jms/src/com/baeldung/spring/jms/Employee.java
rename to spring-jms/src/main/java/com/baeldung/spring/jms/Employee.java
index a0346c4291..4da02907a9 100644
--- a/spring-jms/src/com/baeldung/spring/jms/Employee.java
+++ b/spring-jms/src/main/java/com/baeldung/spring/jms/Employee.java
@@ -1,23 +1,23 @@
-package com.baeldung.spring.jms;
-
-public class Employee {
-    private String name;
-    private Integer age;
-
-    public Employee(String name, Integer age) {
-        this.name = name;
-        this.age = age;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public Integer getAge() {
-        return age;
-    }
-
-    public String toString() {
-        return "Person: name(" + name + "), age(" + age + ")";
-    }
-}
+package com.baeldung.spring.jms;
+
+public class Employee {
+    private String name;
+    private Integer age;
+
+    public Employee(String name, Integer age) {
+        this.name = name;
+        this.age = age;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Integer getAge() {
+        return age;
+    }
+
+    public String toString() {
+        return "Person: name(" + name + "), age(" + age + ")";
+    }
+}
diff --git a/spring-jms/src/com/baeldung/spring/jms/SampleJMSExample.java b/spring-jms/src/main/java/com/baeldung/spring/jms/SampleJMSExample.java
similarity index 79%
rename from spring-jms/src/com/baeldung/spring/jms/SampleJMSExample.java
rename to spring-jms/src/main/java/com/baeldung/spring/jms/SampleJMSExample.java
index bdde97b82d..a243bc1390 100644
--- a/spring-jms/src/com/baeldung/spring/jms/SampleJMSExample.java
+++ b/spring-jms/src/main/java/com/baeldung/spring/jms/SampleJMSExample.java
@@ -1,17 +1,16 @@
-package com.baeldung.spring.jms;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import org.apache.activemq.broker.BrokerFactory;
-import org.apache.activemq.broker.BrokerService;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-public class SampleJMSExample {
-    public static void main(String[] args) throws URISyntaxException, Exception {
-        BrokerService broker = BrokerFactory.createBroker(new URI("broker:(tcp://localhost:61616)"));
-        broker.start();
-        ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("applicationContext.xml");
-
-    }
-}
+package com.baeldung.spring.jms;
+
+import org.apache.activemq.broker.BrokerFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+import java.net.URI;
+
+public class SampleJMSExample {
+    public static void main(String[] args) throws Exception {
+        BrokerService broker = BrokerFactory.createBroker(new URI("broker:(tcp://localhost:61616)"));
+        broker.start();
+        ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("applicationContext.xml");
+
+    }
+}
diff --git a/spring-jms/src/com/baeldung/spring/jms/SampleJmsMessageSender.java b/spring-jms/src/main/java/com/baeldung/spring/jms/SampleJmsMessageSender.java
similarity index 73%
rename from spring-jms/src/com/baeldung/spring/jms/SampleJmsMessageSender.java
rename to spring-jms/src/main/java/com/baeldung/spring/jms/SampleJmsMessageSender.java
index e3eccea03e..865a1d4747 100644
--- a/spring-jms/src/com/baeldung/spring/jms/SampleJmsMessageSender.java
+++ b/spring-jms/src/main/java/com/baeldung/spring/jms/SampleJmsMessageSender.java
@@ -1,32 +1,28 @@
-package com.baeldung.spring.jms;
-
-import javax.jms.ConnectionFactory;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.Queue;
-import javax.jms.Session;
-
-import org.springframework.jms.core.JmsTemplate;
-import org.springframework.jms.core.MessageCreator;
-
-public class SampleJmsMessageSender {
-
-    private JmsTemplate jmsTemplate;
-    private Queue queue;
-
-    public void setConnectionFactory(ConnectionFactory cf) {
-        this.jmsTemplate = new JmsTemplate(cf);
-    }
-
-    public void setQueue(Queue queue) {
-        this.queue = queue;
-    }
-
-    public void simpleSend() {
-        this.jmsTemplate.send(this.queue, new MessageCreator() {
-            public Message createMessage(Session session) throws JMSException {
-                return session.createTextMessage("hello queue world");
-            }
-        });
-    }
+package com.baeldung.spring.jms;
+
+import org.springframework.jms.core.JmsTemplate;
+import org.springframework.jms.core.MessageCreator;
+
+import javax.jms.*;
+
+public class SampleJmsMessageSender {
+
+    private JmsTemplate jmsTemplate;
+    private Queue queue;
+
+    public void createJmsTemplate(ConnectionFactory cf) {
+        this.jmsTemplate = new JmsTemplate(cf);
+    }
+
+    public void setQueue(Queue queue) {
+        this.queue = queue;
+    }
+
+    public void simpleSend() {
+        this.jmsTemplate.send(this.queue, new MessageCreator() {
+            public Message createMessage(Session session) throws JMSException {
+                return session.createTextMessage("hello queue world");
+            }
+        });
+    }
 }
\ No newline at end of file
diff --git a/spring-jms/src/com/baeldung/spring/jms/SampleListener.java b/spring-jms/src/main/java/com/baeldung/spring/jms/SampleListener.java
similarity index 96%
rename from spring-jms/src/com/baeldung/spring/jms/SampleListener.java
rename to spring-jms/src/main/java/com/baeldung/spring/jms/SampleListener.java
index 466cac44a0..0320870d88 100644
--- a/spring-jms/src/com/baeldung/spring/jms/SampleListener.java
+++ b/spring-jms/src/main/java/com/baeldung/spring/jms/SampleListener.java
@@ -1,23 +1,23 @@
-package com.baeldung.spring.jms;
-
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.TextMessage;
-
-public class SampleListener implements MessageListener {
-
-    private String textMessage;
-
-    public void onMessage(Message message) {
-        if (message instanceof TextMessage) {
-            try {
-                textMessage = ((TextMessage) message).getText();
-            } catch (JMSException ex) {
-                throw new RuntimeException(ex);
-            }
-        } else {
-            throw new IllegalArgumentException("Message Error");
-        }
-    }
+package com.baeldung.spring.jms;
+
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import javax.jms.TextMessage;
+
+public class SampleListener implements MessageListener {
+
+    private String textMessage;
+
+    public void onMessage(Message message) {
+        if (message instanceof TextMessage) {
+            try {
+                textMessage = ((TextMessage) message).getText();
+            } catch (JMSException ex) {
+                throw new RuntimeException(ex);
+            }
+        } else {
+            throw new IllegalArgumentException("Message Error");
+        }
+    }
 }
\ No newline at end of file
diff --git a/spring-jms/src/com/baeldung/spring/jms/SampleMessageConverter.java b/spring-jms/src/main/java/com/baeldung/spring/jms/SampleMessageConverter.java
similarity index 85%
rename from spring-jms/src/com/baeldung/spring/jms/SampleMessageConverter.java
rename to spring-jms/src/main/java/com/baeldung/spring/jms/SampleMessageConverter.java
index 856e0e9e49..6cfc588f13 100644
--- a/spring-jms/src/com/baeldung/spring/jms/SampleMessageConverter.java
+++ b/spring-jms/src/main/java/com/baeldung/spring/jms/SampleMessageConverter.java
@@ -1,27 +1,26 @@
-package com.baeldung.spring.jms;
-
-import javax.jms.JMSException;
-import javax.jms.MapMessage;
-import javax.jms.Message;
-import javax.jms.Session;
-
-import org.springframework.jms.support.converter.MessageConversionException;
-import org.springframework.jms.support.converter.MessageConverter;
-
-public class SampleMessageConverter implements MessageConverter {
-
-    public Message toMessage(Object object, Session session) throws JMSException, MessageConversionException {
-        Employee person = (Employee) object;
-        MapMessage message = session.createMapMessage();
-        message.setString("name", person.getName());
-        message.setInt("age", person.getAge());
-        return message;
-    }
-
-    public Object fromMessage(Message message) throws JMSException, MessageConversionException {
-        MapMessage mapMessage = (MapMessage) message;
-        Employee person = new Employee(mapMessage.getString("name"), mapMessage.getInt("age"));
-        return person;
-    }
-
-}
+package com.baeldung.spring.jms;
+
+import org.springframework.jms.support.converter.MessageConversionException;
+import org.springframework.jms.support.converter.MessageConverter;
+
+import javax.jms.JMSException;
+import javax.jms.MapMessage;
+import javax.jms.Message;
+import javax.jms.Session;
+
+public class SampleMessageConverter implements MessageConverter {
+
+    public Message toMessage(Object object, Session session) throws JMSException, MessageConversionException {
+        Employee person = (Employee) object;
+        MapMessage message = session.createMapMessage();
+        message.setString("name", person.getName());
+        message.setInt("age", person.getAge());
+        return message;
+    }
+
+    public Object fromMessage(Message message) throws JMSException, MessageConversionException {
+        MapMessage mapMessage = (MapMessage) message;
+        return new Employee(mapMessage.getString("name"), mapMessage.getInt("age"));
+    }
+
+}