diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..5ab5d39
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,16 @@
+root = true
+
+[*.{cc,h,inl}]
+indent_size = 4
+tab_width = 4
+indent_style = space
+
+[*.{pro,pri}]
+indent_size = 4
+tab_width = 4
+indent_style = space
+
+[*.{md,markdown}]
+indent_size = 2
+tab_width = 2
+indent_style = space
diff --git a/.github/workflows/c-cpp-dev.yml b/.github/workflows/c-cpp-dev.yml
new file mode 100644
index 0000000..e2ba91f
--- /dev/null
+++ b/.github/workflows/c-cpp-dev.yml
@@ -0,0 +1,19 @@
+name: C/C++ CI (Develop,Clang++)
+
+on:
+  push:
+    branches: [ "develop" ]
+  pull_request:
+    branches: [ "develop" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install Packages
+      run: sudo apt update && sudo apt install build-essential
+    - name: Build NeBuild
+      run: make build-nebuild
\ No newline at end of file
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index f9b8e2a..d03c7df 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -1,10 +1,10 @@
-name: C/C++ CI
+name: C/C++ CI (Stable,Clang++)
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "stable" ]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "stable" ]
 
 jobs:
   build:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 78ab417..c4af61e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,15 +6,15 @@ set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-include_directories(${CMAKE_SOURCE_DIR}/dev ${CMAKE_SOURCE_DIR}/vendor)
+include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/vendor)
 
-file(GLOB NEBUILD_CLI_SOURCES "${CMAKE_SOURCE_DIR}/dev/cli/*.cc")
-file(GLOB NEBUILD_SRC_SOURCES "${CMAKE_SOURCE_DIR}/dev/src/*.cc")
+file(GLOB NEBUILD_CLI_SOURCES "${CMAKE_SOURCE_DIR}/src/cli/*.cc")
+file(GLOB NEBUILD_SRC_SOURCES "${CMAKE_SOURCE_DIR}/src/lib/*.cc")
 set(NEBUILD_SOURCES ${NEBUILD_CLI_SOURCES} ${NEBUILD_SRC_SOURCES})
 
 add_executable(nebuild ${NEBUILD_SOURCES})
 
-target_include_directories(nebuild PRIVATE ${CMAKE_SOURCE_DIR}/dev ${CMAKE_SOURCE_DIR}/vendor)
+target_include_directories(nebuild PRIVATE ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/vendor)
 
 option(BUILD_WINDOWS "Produce a Windows executable name (nebuild.exe)" OFF)
 
@@ -34,5 +34,5 @@ add_custom_target(build-nebuild-windows
 
 message(STATUS "Project: nebuild")
 message(STATUS "Sources: ${NEBUILD_SOURCES}")
-message(STATUS "Include dirs: ${CMAKE_SOURCE_DIR}/dev;${CMAKE_SOURCE_DIR}/vendor")
+message(STATUS "Include dirs: ${CMAKE_SOURCE_DIR}/src;${CMAKE_SOURCE_DIR}/vendor")
 message(STATUS "To build for Windows-style executable: configure with -DBUILD_WINDOWS=ON")
diff --git a/ReadMe.md b/README.md
similarity index 88%
rename from ReadMe.md
rename to README.md
index bb4d4dc..0a3eb57 100644
--- a/ReadMe.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # NeBuild
 
 ![CI](https://github.com/nekernel-org/nebuild/actions/workflows/c-cpp.yml/badge.svg)
+![CI](https://github.com/nekernel-org/nebuild/actions/workflows/c-cpp-dev.yml/badge.svg)
 [![License: GPL-3.0](https://img.shields.io/badge/license-BSD--3.0-blue.svg)](LICENSE)
 
 ## Requirements: