diff --git a/FixedOrderGen/CMakeLists.txt b/FixedOrderGen/CMakeLists.txt
index dc7b002..b11a719 100644
--- a/FixedOrderGen/CMakeLists.txt
+++ b/FixedOrderGen/CMakeLists.txt
@@ -1,103 +1,89 @@
 cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
 
 set(CMAKE_LEGACY_CYGWIN_WIN32 0)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 project("HEJ Fixed Order Generation" VERSION 2.0.6 LANGUAGES C CXX)
 
 ## User settings
 include(CMakeDependentOption)
 
 option(TEST_ALL "Run additional (longer) tests" FALSE)
 option(TEST_COVERAGE "Generate test coverage with \"gcovr\"" FALSE)
 
 # Set a default build type if none was specified
 set(default_build_type "RelWithDebInfo")
 
 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
   message(STATUS "Setting build type to '${default_build_type}' as none was specified.")
   set(CMAKE_BUILD_TYPE "${default_build_type}" CACHE
       STRING "Choose the type of build." FORCE)
   # Set the possible values of build type for cmake-gui
   set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
     "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
 endif()
 
 ## Global flags for the compiler (all warnings)
 if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic")
 elseif (MSVC)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /WX /EHsc")
 endif()
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_STANDARD 14)
 
 ## Create Version
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 
 # Get the latest abbreviated commit hash of the working branch
 execute_process(
   COMMAND git rev-parse HEAD
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
   OUTPUT_VARIABLE PROJECT_GIT_REVISION
   OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 # Get the current working branch
 execute_process(
   COMMAND git rev-parse --abbrev-ref HEAD
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
   OUTPUT_VARIABLE PROJECT_GIT_BRANCH
   OUTPUT_STRIP_TRAILING_WHITESPACE
   )
 
 CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Templates/Version.hh.in
                 include/Version.hh  @ONLY )
 
 ## Use cmake modules from HEJ src
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/../cmake/Modules/")
 
 ## Find HEJ (only dependency)
 ## HEJ includes all sub dependencies (fastjet, lhapdf, ...)
 find_package(HEJ 2 REQUIRED)
 include(RepairTargets) # more reliable cmake targets
 
 # Add test coverage
 if (TEST_COVERAGE AND (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) )
   include(CodeCoverage)
   APPEND_COVERAGE_COMPILER_FLAGS()
-  set(COVERAGE_GCOVR_EXCLUDES "${PROJECT_SOURCE_DIR}/include/LHEF/*"
-                              "${PROJECT_SOURCE_DIR}/include/cxxopts.hpp"
-                              "${PROJECT_SOURCE_DIR}/t/*"
+  set(COVERAGE_GCOVR_EXCLUDES "${PROJECT_SOURCE_DIR}/t/*"
                               "${PROJECT_BINARY_DIR}/*")
   SETUP_TARGET_FOR_COVERAGE_GCOVR_HTML(
     NAME ctest_coverage
     EXECUTABLE ctest
   )
 endif()
 
 ## define executable
-file(GLOB HEJFOG_source ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cc)
-list(REMOVE_ITEM HEJFOG_source ${CMAKE_CURRENT_SOURCE_DIR}/src/main.cc)
-add_library(hejfog_lib STATIC ${HEJFOG_source})
-target_include_directories(hejfog_lib
-  PUBLIC
-    ${PROJECT_SOURCE_DIR}/include
-    ${PROJECT_BINARY_DIR}/include
-)
-add_executable(HEJFOG ${CMAKE_CURRENT_SOURCE_DIR}/src/main.cc)
-
-## link libraries
-set(libraries ${CMAKE_DL_LIBS})
-
-target_link_libraries(hejfog_lib ${libraries} HEJ::HEJ)
+add_subdirectory(src)
+add_executable(HEJFOG src/bin/main.cc)
 target_link_libraries(HEJFOG hejfog_lib)
 
 install(TARGETS HEJFOG DESTINATION bin)
 
 ## tests
 include(CTest)
 ## advanced version of enable_testing()
 ## adds "BUILD_TESTING" option to deactivate testing
 if(BUILD_TESTING)
   add_subdirectory(t)
 endif()
diff --git a/FixedOrderGen/src/CMakeLists.txt b/FixedOrderGen/src/CMakeLists.txt
new file mode 100644
index 0000000..b03336d
--- /dev/null
+++ b/FixedOrderGen/src/CMakeLists.txt
@@ -0,0 +1,13 @@
+file(GLOB src_files *.cc)
+
+add_library(hejfog_lib STATIC ${src_files})
+target_include_directories(hejfog_lib
+  PUBLIC
+    ${PROJECT_SOURCE_DIR}/include
+    ${PROJECT_BINARY_DIR}/include
+)
+
+## link libraries
+set(libraries ${CMAKE_DL_LIBS})
+
+target_link_libraries(hejfog_lib ${libraries} HEJ::HEJ)
diff --git a/FixedOrderGen/src/main.cc b/FixedOrderGen/src/bin/main.cc
similarity index 100%
rename from FixedOrderGen/src/main.cc
rename to FixedOrderGen/src/bin/main.cc