diff --git a/.gitignore b/.gitignore
index 3840b7d..4eeab9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,11 @@
+# PyCharm
+/.idea/*
+!/.idea/runConfigurations
+!/.idea/cmake.xml
+
 # Python 
-**/.idea/*
-!**/.idea/runConfigurations
 __pycache__
-venv
+/venv
 
 
 # Eclipse
diff --git a/.idea/cmake.xml b/.idea/cmake.xml
new file mode 100644
index 0000000..1624d4e
--- /dev/null
+++ b/.idea/cmake.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CMakeSharedSettings">
+    <configurations>
+      <configuration PROFILE_NAME="Debug" ENABLED="true" CONFIG_NAME="Debug" />
+      <configuration PROFILE_NAME="Debug Linux" ENABLED="false" GENERATION_DIR="cmake-build-debug" CONFIG_NAME="Debug" GENERATION_OPTIONS="-DFSFW_OSAL=linux" />
+    </configurations>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.run/fsfw-example-hosted.run.xml b/.run/fsfw-example-hosted.run.xml
new file mode 100644
index 0000000..9d5e7e5
--- /dev/null
+++ b/.run/fsfw-example-hosted.run.xml
@@ -0,0 +1,7 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="fsfw-example-hosted" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="fsfw-example-hosted" TARGET_NAME="fsfw-example-hosted" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="fsfw-example-hosted" RUN_TARGET_NAME="fsfw-example-hosted">
+    <method v="2">
+      <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/README.md b/README.md
index 3b2cab8..0dcbe64 100644
--- a/README.md
+++ b/README.md
@@ -166,8 +166,8 @@ generation as a cross-platform solution.
 
 1. Create a new folder for the executable.
    ```sh
-   mkdir build-Debug
-   cd build-Debug
+   mkdir cmake-build-debug
+   cd cmake-build-debug
    ```
 
 2. Configure the build system 
@@ -198,8 +198,8 @@ as well to have a convenient way to configure the CMake build.
 1. Open the MinGW64 terminal and navigate to the `fsfw_example` folder
 2. Create a new folder for the executable.
    ```sh
-   mkdir build-Debug
-   cd build-Debug
+   mkdir cmake-build-debug
+   cd cmake-build-debug
    ```
 
    The build options can be displayed with `cmake -L` . 
diff --git a/cmake/scripts/Hosted/make-debug-cfg.sh b/cmake/scripts/Hosted/make-debug-cfg.sh
index 61cd9a9..648e56f 100755
--- a/cmake/scripts/Hosted/make-debug-cfg.sh
+++ b/cmake/scripts/Hosted/make-debug-cfg.sh
@@ -17,7 +17,7 @@ fi
 
 build_generator=""
 os_fsfw="host"
-builddir="build-Debug"
+builddir="cmake-build-debug"
 build_generator="make"
 if [ "${OS}" = "Windows_NT" ]; then
 	python="py"
diff --git a/cmake/scripts/Hosted/make-release-cfg.sh b/cmake/scripts/Hosted/make-release-cfg.sh
index e215dbb..e93ba2f 100755
--- a/cmake/scripts/Hosted/make-release-cfg.sh
+++ b/cmake/scripts/Hosted/make-release-cfg.sh
@@ -17,7 +17,7 @@ fi
 
 build_generator=""
 os_fsfw="host"
-builddir="build-Release"
+builddir="cmake-build-release"
 build_generator="make"
 if [ "${OS}" = "Windows_NT" ]; then
 	python="py"
diff --git a/cmake/scripts/Hosted/ninja-debug-cfg.sh b/cmake/scripts/Hosted/ninja-debug-cfg.sh
index fb825df..527a922 100755
--- a/cmake/scripts/Hosted/ninja-debug-cfg.sh
+++ b/cmake/scripts/Hosted/ninja-debug-cfg.sh
@@ -17,7 +17,7 @@ fi
 
 build_generator=""
 os_fsfw="host"
-builddir="build-Debug"
+builddir="cmake-build-debug"
 build_generator="ninja"
 if [ "${OS}" = "Windows_NT" ]; then
     python="py"
diff --git a/cmake/scripts/Hosted/ninja-release-cfg.sh b/cmake/scripts/Hosted/ninja-release-cfg.sh
index b2998db..4cb08de 100755
--- a/cmake/scripts/Hosted/ninja-release-cfg.sh
+++ b/cmake/scripts/Hosted/ninja-release-cfg.sh
@@ -17,7 +17,7 @@ fi
 
 build_generator=""
 os_fsfw="host"
-builddir="build-Release"
+builddir="cmake-build-release"
 build_generator="Ninja"
 if [ "${OS}" = "Windows_NT" ]; then
     python="py"
diff --git a/cmake/scripts/Linux/make-debug-cfg.sh b/cmake/scripts/Linux/make-debug-cfg.sh
index 0e66388..0971a08 100755
--- a/cmake/scripts/Linux/make-debug-cfg.sh
+++ b/cmake/scripts/Linux/make-debug-cfg.sh
@@ -17,7 +17,7 @@ fi
 
 build_generator="make"
 os_fsfw="linux"
-builddir="build-Debug"
+builddir="cmake-build-debug"
 if [ "${OS}" = "Windows_NT" ]; then
     python="py"
 # Could be other OS but this works for now.
diff --git a/cmake/scripts/Linux/make-release-cfg.sh b/cmake/scripts/Linux/make-release-cfg.sh
index 89a6712..d8b5d50 100755
--- a/cmake/scripts/Linux/make-release-cfg.sh
+++ b/cmake/scripts/Linux/make-release-cfg.sh
@@ -17,7 +17,7 @@ fi
 
 build_generator="make"
 os_fsfw="linux"
-builddir="build-Release"
+builddir="cmake-build-release"
 if [ "${OS}" = "Windows_NT" ]; then
     python="py"
 # Could be other OS but this works for now.
diff --git a/cmake/scripts/Linux/ninja-debug-cfg.sh b/cmake/scripts/Linux/ninja-debug-cfg.sh
index fc28dd2..4c01cac 100755
--- a/cmake/scripts/Linux/ninja-debug-cfg.sh
+++ b/cmake/scripts/Linux/ninja-debug-cfg.sh
@@ -17,7 +17,7 @@ fi
 
 build_generator="ninja"
 os_fsfw="linux"
-builddir="build-Debug"
+builddir="cmake-build-debug"
 if [ "${OS}" = "Windows_NT" ]; then
     python="py"
 # Could be other OS but this works for now.