diff --git a/Applications/FileIO/CMakeLists.txt b/Applications/FileIO/CMakeLists.txt
index 5b9d973135fe3f991daca2a6fe77392a1255c662..e140aeb5fc01edf245dfd9e37795b74a03d82cdf 100644
--- a/Applications/FileIO/CMakeLists.txt
+++ b/Applications/FileIO/CMakeLists.txt
@@ -11,6 +11,11 @@ if(QT4_FOUND)
     APPEND_SOURCE_FILES(SOURCES FEFLOW)
 endif()
 
+if(OGS_BUILD_SWMM)
+    GET_SOURCE_FILES(SOURCES_SWMM SWMM)
+    SET(SOURCES ${SOURCES} ${SOURCES_SWMM})
+endif()
+
 include(${PROJECT_SOURCE_DIR}/scripts/cmake/OGSEnabledElements.cmake)
 
 # Create the library
diff --git a/Applications/Utils/SWMMConverter/SWMMInterface.cpp b/Applications/FileIO/SWMM/SWMMInterface.cpp
similarity index 100%
rename from Applications/Utils/SWMMConverter/SWMMInterface.cpp
rename to Applications/FileIO/SWMM/SWMMInterface.cpp
diff --git a/Applications/Utils/SWMMConverter/SWMMInterface.h b/Applications/FileIO/SWMM/SWMMInterface.h
similarity index 100%
rename from Applications/Utils/SWMMConverter/SWMMInterface.h
rename to Applications/FileIO/SWMM/SWMMInterface.h
diff --git a/Applications/Utils/SWMMConverter/CMakeLists.txt b/Applications/Utils/SWMMConverter/CMakeLists.txt
index b37969bfd343cfa639d23e271f4c91e528a69fa3..d9a14ae8ac04d5b309f25dbc6e7380b049124fd0 100644
--- a/Applications/Utils/SWMMConverter/CMakeLists.txt
+++ b/Applications/Utils/SWMMConverter/CMakeLists.txt
@@ -1,16 +1,16 @@
 add_executable(SWMMConverter
     SWMMConverter.cpp
-    SwmmInterface.h
-    SwmmInterface.cpp
 )
 
 target_link_libraries(SWMMConverter
     ApplicationsFileIO
     GeoLib
     MeshLib
-    swmm5interface
+    SwmmInterface
 )
 
+include_directories( ${CMAKE_SOURCE_DIR}/Applications/FileIO )
+
 ADD_VTK_DEPENDENCY(SWMMConverter)
 
 set_target_properties(SWMMConverter PROPERTIES FOLDER Utilities)
diff --git a/Applications/Utils/SWMMConverter/SWMMConverter.cpp b/Applications/Utils/SWMMConverter/SWMMConverter.cpp
index bac691abc3bb1207a46ed1b99d8c5f25492334d3..cb784c0120e77d6ee7460eba1e4ac35aa8f77dd3 100644
--- a/Applications/Utils/SWMMConverter/SWMMConverter.cpp
+++ b/Applications/Utils/SWMMConverter/SWMMConverter.cpp
@@ -8,7 +8,7 @@
 
 #include <tclap/CmdLine.h>
 
-#include "SWMMInterface.h"
+#include "Applications/FileIO/SWMM/SWMMInterface.h"
 #include "ThirdParty/SWMMInterface/swmm5_iface.h"
 
 #include "Applications/ApplicationsLib/LogogSetup.h"
diff --git a/ThirdParty/CMakeLists.txt b/ThirdParty/CMakeLists.txt
index 8f75c2e6a6077fc893827b78302c0a2d6798c038..ef5bc7826ce0f78c57477ac8aa267a93be0a3f71 100644
--- a/ThirdParty/CMakeLists.txt
+++ b/ThirdParty/CMakeLists.txt
@@ -52,6 +52,5 @@ if(NOT TARGET vtkGUISupportQt AND OGS_BUILD_GUI)
 endif()
 
 if(OGS_BUILD_SWMM)
-    add_subdirectory(${CMAKE_SOURCE_DIR}/ThirdParty/SWMMInterface/swmm5)
     add_subdirectory(${CMAKE_SOURCE_DIR}/ThirdParty/SWMMInterface)
 endif()