diff --git a/CMakeLists.txt b/CMakeLists.txt
index e63349a..5a7c934 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,8 +39,7 @@ message(STATUS "Build type: " ${CMAKE_BUILD_TYPE})
 
 ## Options
 option(DOUBLE_PRECISION "Generates double precision code."                    OFF)
-option(BUILD_SAMPLES    "Builds projects in samples subdirectory."            OFF)
-option(BUILD_STANDALONE "Builds standalone Astaroth."                         ON)
+option(BUILD_SAMPLES    "Builds projects in samples subdirectory."            ON)
 option(MPI_ENABLED      "Enables additional functions for MPI communciation." OFF)
 option(MULTIGPU_ENABLED "Enables multi-GPU on a single node. Uses peer-to-peer communication instead of MPI. Affects Legacy & Node layers only." ON)
 
@@ -79,8 +78,13 @@ if (DOUBLE_PRECISION)
     add_definitions(-DAC_DOUBLE_PRECISION=1)
 endif ()
 if (MPI_ENABLED)
+    find_package(MPI REQUIRED COMPONENTS C)
+    include_directories(${MPI_C_INCLUDE_DIRS})
     add_definitions(-DAC_MPI_ENABLED=1)
 endif ()
+if (MULTIGPU_ENABLED)
+  add_definitions(-DAC_MULTIGPU_ENABLED=1)
+endif()
 
 add_definitions(-DAC_DEFAULT_CONFIG="${CMAKE_SOURCE_DIR}/config/astaroth.conf")
 
@@ -90,17 +94,13 @@ include_directories(src/common)                                # Common headers
 include_directories(${CMAKE_BINARY_DIR})                       # DSL headers
 include_directories(${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}) # CUDA headers
 
-if (MPI_ENABLED)
-    find_package(MPI REQUIRED COMPONENTS C)
-    include_directories(${MPI_C_INCLUDE_DIRS})
-endif()
-
 ## Subdirectories
 add_subdirectory(src/utils)
 add_subdirectory(src/core/kernels)
 add_subdirectory(src/core)
 
 if (BUILD_SAMPLES)
+    add_subdirectory(samples/standalone)
     add_subdirectory(samples/ctest)
     add_subdirectory(samples/cpptest)
     add_subdirectory(samples/mpitest)
@@ -113,7 +113,3 @@ if (BUILD_SAMPLES)
       add_subdirectory(samples/bwtest)
     endif()
 endif()
-
-if (BUILD_STANDALONE)
-    add_subdirectory(src/standalone)
-endif()
diff --git a/src/standalone/CMakeLists.txt b/samples/standalone/CMakeLists.txt
similarity index 100%
rename from src/standalone/CMakeLists.txt
rename to samples/standalone/CMakeLists.txt
diff --git a/src/standalone/autotest.cc b/samples/standalone/autotest.cc
similarity index 100%
rename from src/standalone/autotest.cc
rename to samples/standalone/autotest.cc
diff --git a/src/standalone/benchmark.cc b/samples/standalone/benchmark.cc
similarity index 100%
rename from src/standalone/benchmark.cc
rename to samples/standalone/benchmark.cc
diff --git a/src/standalone/config_loader.cc b/samples/standalone/config_loader.cc
similarity index 100%
rename from src/standalone/config_loader.cc
rename to samples/standalone/config_loader.cc
diff --git a/src/standalone/config_loader.h b/samples/standalone/config_loader.h
similarity index 100%
rename from src/standalone/config_loader.h
rename to samples/standalone/config_loader.h
diff --git a/src/standalone/main.cc b/samples/standalone/main.cc
similarity index 100%
rename from src/standalone/main.cc
rename to samples/standalone/main.cc
diff --git a/src/standalone/model/host_forcing.cc b/samples/standalone/model/host_forcing.cc
similarity index 100%
rename from src/standalone/model/host_forcing.cc
rename to samples/standalone/model/host_forcing.cc
diff --git a/src/standalone/model/host_forcing.h b/samples/standalone/model/host_forcing.h
similarity index 100%
rename from src/standalone/model/host_forcing.h
rename to samples/standalone/model/host_forcing.h
diff --git a/src/standalone/model/host_memory.cc b/samples/standalone/model/host_memory.cc
similarity index 100%
rename from src/standalone/model/host_memory.cc
rename to samples/standalone/model/host_memory.cc
diff --git a/src/standalone/model/host_memory.h b/samples/standalone/model/host_memory.h
similarity index 100%
rename from src/standalone/model/host_memory.h
rename to samples/standalone/model/host_memory.h
diff --git a/src/standalone/model/host_timestep.cc b/samples/standalone/model/host_timestep.cc
similarity index 100%
rename from src/standalone/model/host_timestep.cc
rename to samples/standalone/model/host_timestep.cc
diff --git a/src/standalone/model/host_timestep.h b/samples/standalone/model/host_timestep.h
similarity index 100%
rename from src/standalone/model/host_timestep.h
rename to samples/standalone/model/host_timestep.h
diff --git a/src/standalone/model/model_boundconds.cc b/samples/standalone/model/model_boundconds.cc
similarity index 100%
rename from src/standalone/model/model_boundconds.cc
rename to samples/standalone/model/model_boundconds.cc
diff --git a/src/standalone/model/model_boundconds.h b/samples/standalone/model/model_boundconds.h
similarity index 100%
rename from src/standalone/model/model_boundconds.h
rename to samples/standalone/model/model_boundconds.h
diff --git a/src/standalone/model/model_diff.h b/samples/standalone/model/model_diff.h
similarity index 100%
rename from src/standalone/model/model_diff.h
rename to samples/standalone/model/model_diff.h
diff --git a/src/standalone/model/model_reduce.cc b/samples/standalone/model/model_reduce.cc
similarity index 100%
rename from src/standalone/model/model_reduce.cc
rename to samples/standalone/model/model_reduce.cc
diff --git a/src/standalone/model/model_reduce.h b/samples/standalone/model/model_reduce.h
similarity index 100%
rename from src/standalone/model/model_reduce.h
rename to samples/standalone/model/model_reduce.h
diff --git a/src/standalone/model/model_rk3.cc b/samples/standalone/model/model_rk3.cc
similarity index 100%
rename from src/standalone/model/model_rk3.cc
rename to samples/standalone/model/model_rk3.cc
diff --git a/src/standalone/model/model_rk3.h b/samples/standalone/model/model_rk3.h
similarity index 100%
rename from src/standalone/model/model_rk3.h
rename to samples/standalone/model/model_rk3.h
diff --git a/src/standalone/model/modelmesh.h b/samples/standalone/model/modelmesh.h
similarity index 100%
rename from src/standalone/model/modelmesh.h
rename to samples/standalone/model/modelmesh.h
diff --git a/src/standalone/renderer.cc b/samples/standalone/renderer.cc
similarity index 100%
rename from src/standalone/renderer.cc
rename to samples/standalone/renderer.cc
diff --git a/src/standalone/run.h b/samples/standalone/run.h
similarity index 100%
rename from src/standalone/run.h
rename to samples/standalone/run.h
diff --git a/src/standalone/simulation.cc b/samples/standalone/simulation.cc
similarity index 100%
rename from src/standalone/simulation.cc
rename to samples/standalone/simulation.cc
diff --git a/src/standalone/timer_hires.h b/samples/standalone/timer_hires.h
similarity index 100%
rename from src/standalone/timer_hires.h
rename to samples/standalone/timer_hires.h
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 801ba1e..ca96366 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -6,12 +6,5 @@ target_link_libraries(astaroth_core astaroth_kernels CUDA::cudart CUDA::cuda_dri
 
 ## Options
 if (MPI_ENABLED)
-    #find_package(MPI REQUIRED)
-    #find_package(OpenMP)
-    #target_link_libraries(astaroth_core MPI::MPI_CXX OpenMP::OpenMP_CXX)
     target_link_libraries(astaroth_core MPI::MPI_C)
 endif()
-
-if (MULTIGPU_ENABLED)
-    target_compile_definitions(astaroth_core PRIVATE -DAC_MULTIGPU_ENABLED=1)
-endif ()