diff --git a/mapstruct/bin/pom.xml b/mapstruct/bin/pom.xml
deleted file mode 100644
index 8a28ae9511..0000000000
--- a/mapstruct/bin/pom.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>mapstruct</artifactId>
-	<name>mapstruct</name>
-	<groupId>com.baeldung</groupId>
-	<version>1.0</version>
-	<packaging>jar</packaging>
-
-	<properties>
-		<org.mapstruct.version>1.0.0.Final</org.mapstruct.version>
-	</properties>
-	<dependencies>
-		<dependency>
-			<groupId>org.mapstruct</groupId>
-			<artifactId>mapstruct-jdk8</artifactId>
-			<version>${org.mapstruct.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.12</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-	<build>
-		<finalName>mapstruct</finalName>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.5.1</version>
-				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
-					<annotationProcessorPaths>
-						<path>
-							<groupId>org.mapstruct</groupId>
-							<artifactId>mapstruct-processor</artifactId>
-							<version>${org.mapstruct.version}</version>
-						</path>
-					</annotationProcessorPaths>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-</project> 
diff --git a/mapstruct/src/main/java/org/baeldung/dto/DivisionDTO.java b/mapstruct/src/main/java/com/baeldung/dto/DivisionDTO.java
similarity index 94%
rename from mapstruct/src/main/java/org/baeldung/dto/DivisionDTO.java
rename to mapstruct/src/main/java/com/baeldung/dto/DivisionDTO.java
index 01a5792176..37f8bd111b 100644
--- a/mapstruct/src/main/java/org/baeldung/dto/DivisionDTO.java
+++ b/mapstruct/src/main/java/com/baeldung/dto/DivisionDTO.java
@@ -1,4 +1,4 @@
-package org.baeldung.dto;
+package com.baeldung.dto;
 
 public class DivisionDTO {
 
diff --git a/mapstruct/src/main/java/org/baeldung/dto/EmployeeDTO.java b/mapstruct/src/main/java/com/baeldung/dto/EmployeeDTO.java
similarity index 97%
rename from mapstruct/src/main/java/org/baeldung/dto/EmployeeDTO.java
rename to mapstruct/src/main/java/com/baeldung/dto/EmployeeDTO.java
index 24d6950cab..5da3165683 100644
--- a/mapstruct/src/main/java/org/baeldung/dto/EmployeeDTO.java
+++ b/mapstruct/src/main/java/com/baeldung/dto/EmployeeDTO.java
@@ -1,4 +1,4 @@
-package org.baeldung.dto;
+package com.baeldung.dto;
 
 public class EmployeeDTO {
 
diff --git a/mapstruct/src/main/java/org/baeldung/dto/SimpleSource.java b/mapstruct/src/main/java/com/baeldung/dto/SimpleSource.java
similarity index 93%
rename from mapstruct/src/main/java/org/baeldung/dto/SimpleSource.java
rename to mapstruct/src/main/java/com/baeldung/dto/SimpleSource.java
index 4c169461c8..ec8d80c4af 100644
--- a/mapstruct/src/main/java/org/baeldung/dto/SimpleSource.java
+++ b/mapstruct/src/main/java/com/baeldung/dto/SimpleSource.java
@@ -1,4 +1,4 @@
-package org.baeldung.dto;
+package com.baeldung.dto;
 
 public class SimpleSource {
 
diff --git a/mapstruct/src/main/java/org/baeldung/entity/Division.java b/mapstruct/src/main/java/com/baeldung/entity/Division.java
similarity index 94%
rename from mapstruct/src/main/java/org/baeldung/entity/Division.java
rename to mapstruct/src/main/java/com/baeldung/entity/Division.java
index 83b0916eb4..7b1416d6c5 100644
--- a/mapstruct/src/main/java/org/baeldung/entity/Division.java
+++ b/mapstruct/src/main/java/com/baeldung/entity/Division.java
@@ -1,4 +1,4 @@
-package org.baeldung.entity;
+package com.baeldung.entity;
 
 public class Division {
 
diff --git a/mapstruct/src/main/java/org/baeldung/entity/Employee.java b/mapstruct/src/main/java/com/baeldung/entity/Employee.java
similarity index 96%
rename from mapstruct/src/main/java/org/baeldung/entity/Employee.java
rename to mapstruct/src/main/java/com/baeldung/entity/Employee.java
index 8c441813b6..04044f4dfe 100644
--- a/mapstruct/src/main/java/org/baeldung/entity/Employee.java
+++ b/mapstruct/src/main/java/com/baeldung/entity/Employee.java
@@ -1,4 +1,4 @@
-package org.baeldung.entity;
+package com.baeldung.entity;
 
 import java.util.Date;
 
diff --git a/mapstruct/src/main/java/org/baeldung/entity/SimpleDestination.java b/mapstruct/src/main/java/com/baeldung/entity/SimpleDestination.java
similarity index 93%
rename from mapstruct/src/main/java/org/baeldung/entity/SimpleDestination.java
rename to mapstruct/src/main/java/com/baeldung/entity/SimpleDestination.java
index 9fdbd7f054..d9cba1c372 100644
--- a/mapstruct/src/main/java/org/baeldung/entity/SimpleDestination.java
+++ b/mapstruct/src/main/java/com/baeldung/entity/SimpleDestination.java
@@ -1,4 +1,4 @@
-package org.baeldung.entity;
+package com.baeldung.entity;
 
 public class SimpleDestination {
 
diff --git a/mapstruct/src/main/java/org/baeldung/mapper/EmployeeMapper.java b/mapstruct/src/main/java/com/baeldung/mapper/EmployeeMapper.java
similarity index 85%
rename from mapstruct/src/main/java/org/baeldung/mapper/EmployeeMapper.java
rename to mapstruct/src/main/java/com/baeldung/mapper/EmployeeMapper.java
index 013c332e6e..8e00103d0e 100644
--- a/mapstruct/src/main/java/org/baeldung/mapper/EmployeeMapper.java
+++ b/mapstruct/src/main/java/com/baeldung/mapper/EmployeeMapper.java
@@ -1,15 +1,15 @@
-package org.baeldung.mapper;
+package com.baeldung.mapper;
 
-import java.util.List;
-
-import org.baeldung.dto.DivisionDTO;
-import org.baeldung.dto.EmployeeDTO;
-import org.baeldung.entity.Division;
-import org.baeldung.entity.Employee;
+import com.baeldung.dto.DivisionDTO;
+import com.baeldung.dto.EmployeeDTO;
+import com.baeldung.entity.Division;
+import com.baeldung.entity.Employee;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.Mappings;
 
+import java.util.List;
+
 @Mapper
 public interface EmployeeMapper {
 
diff --git a/mapstruct/src/main/java/org/baeldung/mapper/SimpleSourceDestinationMapper.java b/mapstruct/src/main/java/com/baeldung/mapper/SimpleSourceDestinationMapper.java
similarity index 69%
rename from mapstruct/src/main/java/org/baeldung/mapper/SimpleSourceDestinationMapper.java
rename to mapstruct/src/main/java/com/baeldung/mapper/SimpleSourceDestinationMapper.java
index 3e872e68a3..f3f2187c20 100644
--- a/mapstruct/src/main/java/org/baeldung/mapper/SimpleSourceDestinationMapper.java
+++ b/mapstruct/src/main/java/com/baeldung/mapper/SimpleSourceDestinationMapper.java
@@ -1,7 +1,7 @@
-package org.baeldung.mapper;
+package com.baeldung.mapper;
 
-import org.baeldung.dto.SimpleSource;
-import org.baeldung.entity.SimpleDestination;
+import com.baeldung.dto.SimpleSource;
+import com.baeldung.entity.SimpleDestination;
 import org.mapstruct.Mapper;
 
 @Mapper(componentModel = "spring")
diff --git a/mapstruct/src/main/resources/applicationContext.xml b/mapstruct/src/main/resources/applicationContext.xml
index 1e6649139c..22d8d1b769 100644
--- a/mapstruct/src/main/resources/applicationContext.xml
+++ b/mapstruct/src/main/resources/applicationContext.xml
@@ -10,6 +10,6 @@
 		http://www.springframework.org/schema/aop 
 	http://www.springframework.org/schema/aop/spring-aop.xsd">
 
-	<context:component-scan base-package="org.baeldung" />
+	<context:component-scan base-package="com.baeldung" />
 
 </beans>
\ No newline at end of file
diff --git a/mapstruct/src/test/java/org/baeldung/mapper/EmployeeMapperTest.java b/mapstruct/src/test/java/com/baeldung/mapper/EmployeeMapperTest.java
similarity index 96%
rename from mapstruct/src/test/java/org/baeldung/mapper/EmployeeMapperTest.java
rename to mapstruct/src/test/java/com/baeldung/mapper/EmployeeMapperTest.java
index c5998f89ef..7da6c41dc1 100644
--- a/mapstruct/src/test/java/org/baeldung/mapper/EmployeeMapperTest.java
+++ b/mapstruct/src/test/java/com/baeldung/mapper/EmployeeMapperTest.java
@@ -1,6 +1,11 @@
-package org.baeldung.mapper;
+package com.baeldung.mapper;
 
-import static org.junit.Assert.assertEquals;
+import com.baeldung.dto.DivisionDTO;
+import com.baeldung.dto.EmployeeDTO;
+import com.baeldung.entity.Division;
+import com.baeldung.entity.Employee;
+import org.junit.Test;
+import org.mapstruct.factory.Mappers;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -8,12 +13,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import org.baeldung.dto.DivisionDTO;
-import org.baeldung.dto.EmployeeDTO;
-import org.baeldung.entity.Division;
-import org.baeldung.entity.Employee;
-import org.junit.Test;
-import org.mapstruct.factory.Mappers;
+import static org.junit.Assert.assertEquals;
 
 public class EmployeeMapperTest {
 
diff --git a/mapstruct/src/test/java/org/baeldung/mapper/SimpleSourceDestinationMapperTest.java b/mapstruct/src/test/java/com/baeldung/mapper/SimpleSourceDestinationMapperTest.java
similarity index 93%
rename from mapstruct/src/test/java/org/baeldung/mapper/SimpleSourceDestinationMapperTest.java
rename to mapstruct/src/test/java/com/baeldung/mapper/SimpleSourceDestinationMapperTest.java
index 226603b16a..a7addf33a7 100644
--- a/mapstruct/src/test/java/org/baeldung/mapper/SimpleSourceDestinationMapperTest.java
+++ b/mapstruct/src/test/java/com/baeldung/mapper/SimpleSourceDestinationMapperTest.java
@@ -1,9 +1,9 @@
-package org.baeldung.mapper;
+package com.baeldung.mapper;
 
 import static org.junit.Assert.assertEquals;
 
-import org.baeldung.dto.SimpleSource;
-import org.baeldung.entity.SimpleDestination;
+import com.baeldung.dto.SimpleSource;
+import com.baeldung.entity.SimpleDestination;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;