diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index 7ad49ad33..f34aac5c9 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -191,6 +191,14 @@ SET( Common_SRCS
 )
 SOURCE_GROUP(Common FILES ${Common_SRCS})
 
+SET( STEPParser_SRCS
+  Importer/STEPParser/STEPFileReader.h
+  Importer/STEPParser/STEPFileReader.cpp
+  Importer/STEPParser/STEPFileEncoding.cpp
+  Importer/STEPParser/STEPFileEncoding.h
+)
+SOURCE_GROUP(STEPParser FILES ${STEPParser_SRCS})
+
 IF ( ASSIMP_BUILD_NONFREE_C4D_IMPORTER )
   SET( C4D_SRCS
     C4DImporter.cpp
@@ -487,11 +495,8 @@ ADD_ASSIMP_IMPORTER( IFC
   Importer/IFC/IFCCurve.cpp
   Importer/IFC/IFCBoolean.cpp
   Importer/IFC/IFCOpenings.cpp
-  Importer/IFC/STEPFileReader.h
-  Importer/IFC/STEPFileReader.cpp
-  Importer/IFC/STEPFileEncoding.cpp
-  Importer/IFC/STEPFileEncoding.h
 )
+
 if (ASSIMP_BUILD_IFC_IMPORTER)
   if (MSVC)
     set_source_files_properties(Importer/IFC/IFCReaderGen1_2x3.cpp Importer/IFC/IFCReaderGen2_2x3.cpp PROPERTIES COMPILE_FLAGS "/bigobj")
@@ -885,6 +890,7 @@ SET( assimp_src
   ${Exporter_SRCS}
   ${PostProcessing_SRCS}
   ${MaterialSystem_SRCS}
+  ${STEPParser_SRCS}
   ${Step_SRCS}
 
   # Model Support
diff --git a/code/Importer/IFC/IFCLoader.cpp b/code/Importer/IFC/IFCLoader.cpp
index f1c99a0f4..473355538 100644
--- a/code/Importer/IFC/IFCLoader.cpp
+++ b/code/Importer/IFC/IFCLoader.cpp
@@ -56,7 +56,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #endif
 
 #include "IFCLoader.h"
-#include "STEPFileReader.h"
+#include "../STEPParser/STEPFileReader.h"
 
 #include "IFCUtil.h"
 
diff --git a/code/Importer/IFC/STEPFileEncoding.cpp b/code/Importer/STEPParser/STEPFileEncoding.cpp
similarity index 100%
rename from code/Importer/IFC/STEPFileEncoding.cpp
rename to code/Importer/STEPParser/STEPFileEncoding.cpp
diff --git a/code/Importer/IFC/STEPFileEncoding.h b/code/Importer/STEPParser/STEPFileEncoding.h
similarity index 100%
rename from code/Importer/IFC/STEPFileEncoding.h
rename to code/Importer/STEPParser/STEPFileEncoding.h
diff --git a/code/Importer/IFC/STEPFileReader.cpp b/code/Importer/STEPParser/STEPFileReader.cpp
similarity index 100%
rename from code/Importer/IFC/STEPFileReader.cpp
rename to code/Importer/STEPParser/STEPFileReader.cpp
diff --git a/code/Importer/IFC/STEPFileReader.h b/code/Importer/STEPParser/STEPFileReader.h
similarity index 100%
rename from code/Importer/IFC/STEPFileReader.h
rename to code/Importer/STEPParser/STEPFileReader.h
diff --git a/code/Importer/StepFile/StepFileImporter.cpp b/code/Importer/StepFile/StepFileImporter.cpp
index 9a34a84f5..9bfaf7051 100644
--- a/code/Importer/StepFile/StepFileImporter.cpp
+++ b/code/Importer/StepFile/StepFileImporter.cpp
@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ASSIMP_BUILD_NO_STEPFILE_IMPORTER
 
 #include "StepFileImporter.h"
-#include "../../Importer/IFC/STEPFileReader.h"
+#include "../../Importer/STEPParser/STEPFileReader.h"
 #include <assimp/importerdesc.h>
 #include <assimp/DefaultIOSystem.h>