diff --git a/core-java-modules/core-java-os-2/.gitignore b/core-java-modules/core-java-os-2/.gitignore
new file mode 100644
index 0000000000..3de4cc647e
--- /dev/null
+++ b/core-java-modules/core-java-os-2/.gitignore
@@ -0,0 +1,26 @@
+*.class
+
+0.*
+
+#folders#
+/target
+/neoDb*
+/data
+/src/main/webapp/WEB-INF/classes
+*/META-INF/*
+.resourceCache
+
+# Packaged files #
+*.jar
+*.war
+*.ear
+
+# Files generated by integration tests
+*.txt
+backup-pom.xml
+/bin/
+/temp
+
+#IntelliJ specific
+.idea/
+*.iml
\ No newline at end of file
diff --git a/core-java-modules/core-java-os-2/README.md b/core-java-modules/core-java-os-2/README.md
new file mode 100644
index 0000000000..fa9f504184
--- /dev/null
+++ b/core-java-modules/core-java-os-2/README.md
@@ -0,0 +1,7 @@
+## Core Java OS
+
+This module contains articles about working with the operating system (OS) in Java
+
+### Relevant Articles: 
+
+
diff --git a/core-java-modules/core-java-os-2/pom.xml b/core-java-modules/core-java-os-2/pom.xml
new file mode 100644
index 0000000000..53fdafa7d4
--- /dev/null
+++ b/core-java-modules/core-java-os-2/pom.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>core-java-os</artifactId>
+    <name>core-java-os</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung.core-java-modules</groupId>
+        <artifactId>core-java-modules</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+    <build>
+        <finalName>core-java-os</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <maven.compiler.source>1.9</maven.compiler.source>
+        <maven.compiler.target>1.9</maven.compiler.target>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-os-2/src/main/java/com/baeldung/system/EnvironmentExample.java b/core-java-modules/core-java-os-2/src/main/java/com/baeldung/system/EnvironmentExample.java
new file mode 100644
index 0000000000..2557c0cfa8
--- /dev/null
+++ b/core-java-modules/core-java-os-2/src/main/java/com/baeldung/system/EnvironmentExample.java
@@ -0,0 +1,9 @@
+package com.baeldung.system;
+
+public class EnvironmentExample {
+    public void getUserName() {
+        String username = System.getenv("USERNAME");
+        System.out.println("User: " + username);
+    }
+
+}
diff --git a/core-java-modules/core-java-os-2/src/main/java/com/baeldung/system/PropertiesExample.java b/core-java-modules/core-java-os-2/src/main/java/com/baeldung/system/PropertiesExample.java
new file mode 100644
index 0000000000..cb203c40c6
--- /dev/null
+++ b/core-java-modules/core-java-os-2/src/main/java/com/baeldung/system/PropertiesExample.java
@@ -0,0 +1,19 @@
+package com.baeldung.system;
+
+public class PropertiesExample {
+    public void getUserName() {
+        String username = System.getProperty("user.name");
+        System.out.println("User: " + username);
+    }
+
+    public void getCustomProp() {
+        String customProperty = System.getProperty("custom.prop");
+        System.out.println("Custom property: " + customProperty);
+    }
+
+    public void getCustomPropWithFallback() {
+        String customProperty = System.getProperty("non-existent-property", "default value");
+        System.out.println("Custom property: " + customProperty);
+    }
+
+}
diff --git a/core-java-modules/core-java-os/src/test/java/com/baeldung/system/WhenDetectingOSUnitTest.java b/core-java-modules/core-java-os/src/test/java/com/baeldung/system/WhenDetectingOSUnitTest.java
deleted file mode 100644
index 27a6dd43c6..0000000000
--- a/core-java-modules/core-java-os/src/test/java/com/baeldung/system/WhenDetectingOSUnitTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.baeldung.system;
-
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-@Ignore
-public class WhenDetectingOSUnitTest {
-
-    private DetectOS os = new DetectOS();
-
-    @Test
-    public void whenUsingSystemProperty_shouldReturnOS() {
-        String expected = "Windows 10";
-        String actual = os.getOperatingSystem();
-        Assert.assertEquals(expected, actual);
-    }
-
-    @Test
-    public void whenUsingSystemUtils_shouldReturnOS() {
-        String expected = "Windows 10";
-        String actual = os.getOperatingSystemSystemUtils();
-        Assert.assertEquals(expected, actual);
-    }
-}
diff --git a/core-java-modules/core-java-os/src/test/java/com/baeldung/system/exit/SystemExitUnitTest.java b/core-java-modules/core-java-os/src/test/java/com/baeldung/system/exit/SystemExitUnitTest.java
deleted file mode 100644
index 8ad3f75623..0000000000
--- a/core-java-modules/core-java-os/src/test/java/com/baeldung/system/exit/SystemExitUnitTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.baeldung.system.exit;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import java.security.Permission;
-
-import static org.junit.Assert.assertEquals;
-
-@Ignore("This test is ignored because it tests deprecated code")
-public class SystemExitUnitTest {
-
-    private SecurityManager securityManager;
-    private SystemExitExample example;
-
-    @Before
-    public void setUp() {
-        example = new SystemExitExample();
-        securityManager = System.getSecurityManager();
-        System.setSecurityManager(new NoExitSecurityManager());
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        System.setSecurityManager(securityManager);
-    }
-
-    @Test
-    public void testExit() throws Exception {
-        try {
-            example.readFile();
-        } catch (ExitException e) {
-            assertEquals("Exit status", 2, e.status);
-        }
-    }
-
-    protected static class ExitException extends SecurityException {
-
-        private static final long serialVersionUID = 1L;
-        public final int status;
-
-        public ExitException(int status) {
-            this.status = status;
-        }
-    }
-
-    private static class NoExitSecurityManager extends SecurityManager {
-        @Override
-        public void checkPermission(Permission perm) {
-        }
-
-        @Override
-        public void checkPermission(Permission perm, Object context) {
-        }
-
-        @Override
-        public void checkExit(int status) {
-            super.checkExit(status);
-            throw new ExitException(status);
-        }
-    }
-}
\ No newline at end of file