summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Libraries/LibJS/AST.cpp6
-rw-r--r--Libraries/LibJS/AST.h2
-rw-r--r--Libraries/LibJS/Heap/Heap.cpp (renamed from Libraries/LibJS/Heap.cpp)6
-rw-r--r--Libraries/LibJS/Heap/Heap.h (renamed from Libraries/LibJS/Heap.h)2
-rw-r--r--Libraries/LibJS/Heap/HeapBlock.cpp (renamed from Libraries/LibJS/HeapBlock.cpp)2
-rw-r--r--Libraries/LibJS/Heap/HeapBlock.h (renamed from Libraries/LibJS/HeapBlock.h)2
-rw-r--r--Libraries/LibJS/Interpreter.cpp12
-rw-r--r--Libraries/LibJS/Interpreter.h4
-rw-r--r--Libraries/LibJS/Makefile30
-rw-r--r--Libraries/LibJS/Runtime/Cell.cpp (renamed from Libraries/LibJS/Cell.cpp)12
-rw-r--r--Libraries/LibJS/Runtime/Cell.h (renamed from Libraries/LibJS/Cell.h)0
-rw-r--r--Libraries/LibJS/Runtime/Function.cpp (renamed from Libraries/LibJS/Function.cpp)4
-rw-r--r--Libraries/LibJS/Runtime/Function.h (renamed from Libraries/LibJS/Function.h)2
-rw-r--r--Libraries/LibJS/Runtime/GlobalObject.cpp (renamed from Libraries/LibJS/GlobalObject.cpp)9
-rw-r--r--Libraries/LibJS/Runtime/GlobalObject.h (renamed from Libraries/LibJS/GlobalObject.h)2
-rw-r--r--Libraries/LibJS/Runtime/NativeFunction.cpp (renamed from Libraries/LibJS/NativeFunction.cpp)4
-rw-r--r--Libraries/LibJS/Runtime/NativeFunction.h (renamed from Libraries/LibJS/NativeFunction.h)2
-rw-r--r--Libraries/LibJS/Runtime/NativeProperty.cpp (renamed from Libraries/LibJS/NativeProperty.cpp)4
-rw-r--r--Libraries/LibJS/Runtime/NativeProperty.h (renamed from Libraries/LibJS/NativeProperty.h)2
-rw-r--r--Libraries/LibJS/Runtime/Object.cpp (renamed from Libraries/LibJS/Object.cpp)10
-rw-r--r--Libraries/LibJS/Runtime/Object.h (renamed from Libraries/LibJS/Object.h)6
-rw-r--r--Libraries/LibJS/Runtime/ObjectPrototype.cpp (renamed from Libraries/LibJS/ObjectPrototype.cpp)6
-rw-r--r--Libraries/LibJS/Runtime/ObjectPrototype.h (renamed from Libraries/LibJS/ObjectPrototype.h)2
-rw-r--r--Libraries/LibJS/Runtime/PrimitiveString.cpp (renamed from Libraries/LibJS/PrimitiveString.cpp)4
-rw-r--r--Libraries/LibJS/Runtime/PrimitiveString.h (renamed from Libraries/LibJS/PrimitiveString.h)2
-rw-r--r--Libraries/LibJS/Runtime/ScriptFunction.cpp (renamed from Libraries/LibJS/ScriptFunction.cpp)4
-rw-r--r--Libraries/LibJS/Runtime/ScriptFunction.h (renamed from Libraries/LibJS/ScriptFunction.h)2
-rw-r--r--Libraries/LibJS/Runtime/StringObject.cpp (renamed from Libraries/LibJS/StringObject.cpp)10
-rw-r--r--Libraries/LibJS/Runtime/StringObject.h (renamed from Libraries/LibJS/StringObject.h)2
-rw-r--r--Libraries/LibJS/Runtime/StringPrototype.cpp (renamed from Libraries/LibJS/StringPrototype.cpp)10
-rw-r--r--Libraries/LibJS/Runtime/StringPrototype.h (renamed from Libraries/LibJS/StringPrototype.h)2
-rw-r--r--Libraries/LibJS/Runtime/Value.cpp (renamed from Libraries/LibJS/Value.cpp)10
-rw-r--r--Libraries/LibJS/Runtime/Value.h (renamed from Libraries/LibJS/Value.h)0
-rw-r--r--Libraries/LibWeb/Bindings/DocumentWrapper.cpp4
-rw-r--r--Libraries/LibWeb/Bindings/NodeWrapper.cpp4
-rw-r--r--Libraries/LibWeb/Bindings/Wrappable.h2
-rw-r--r--Libraries/LibWeb/Bindings/Wrapper.h2
-rw-r--r--Libraries/LibWeb/DOM/Document.cpp2
-rw-r--r--Userland/js.cpp6
39 files changed, 99 insertions, 98 deletions
diff --git a/Libraries/LibJS/AST.cpp b/Libraries/LibJS/AST.cpp
index a431c6fdac..fb7993aea7 100644
--- a/Libraries/LibJS/AST.cpp
+++ b/Libraries/LibJS/AST.cpp
@@ -28,9 +28,9 @@
#include <AK/StringBuilder.h>
#include <LibJS/AST.h>
#include <LibJS/Interpreter.h>
-#include <LibJS/PrimitiveString.h>
-#include <LibJS/ScriptFunction.h>
-#include <LibJS/Value.h>
+#include <LibJS/Runtime/PrimitiveString.h>
+#include <LibJS/Runtime/ScriptFunction.h>
+#include <LibJS/Runtime/Value.h>
#include <stdio.h>
namespace JS {
diff --git a/Libraries/LibJS/AST.h b/Libraries/LibJS/AST.h
index 596b025984..2cf5ed32bd 100644
--- a/Libraries/LibJS/AST.h
+++ b/Libraries/LibJS/AST.h
@@ -31,7 +31,7 @@
#include <AK/String.h>
#include <AK/Vector.h>
#include <LibJS/Forward.h>
-#include <LibJS/Value.h>
+#include <LibJS/Runtime/Value.h>
namespace JS {
diff --git a/Libraries/LibJS/Heap.cpp b/Libraries/LibJS/Heap/Heap.cpp
index 84a7c7b371..9838242a1b 100644
--- a/Libraries/LibJS/Heap.cpp
+++ b/Libraries/LibJS/Heap/Heap.cpp
@@ -26,10 +26,10 @@
#include <AK/Badge.h>
#include <AK/HashTable.h>
-#include <LibJS/Heap.h>
-#include <LibJS/HeapBlock.h>
+#include <LibJS/Heap/Heap.h>
+#include <LibJS/Heap/HeapBlock.h>
#include <LibJS/Interpreter.h>
-#include <LibJS/Object.h>
+#include <LibJS/Runtime/Object.h>
#define HEAP_DEBUG
diff --git a/Libraries/LibJS/Heap.h b/Libraries/LibJS/Heap/Heap.h
index e70d28fa95..8366c80898 100644
--- a/Libraries/LibJS/Heap.h
+++ b/Libraries/LibJS/Heap/Heap.h
@@ -30,8 +30,8 @@
#include <AK/NonnullOwnPtr.h>
#include <AK/Types.h>
#include <AK/Vector.h>
-#include <LibJS/Cell.h>
#include <LibJS/Forward.h>
+#include <LibJS/Runtime/Cell.h>
namespace JS {
diff --git a/Libraries/LibJS/HeapBlock.cpp b/Libraries/LibJS/Heap/HeapBlock.cpp
index 01fb20b00f..3055547422 100644
--- a/Libraries/LibJS/HeapBlock.cpp
+++ b/Libraries/LibJS/Heap/HeapBlock.cpp
@@ -27,7 +27,7 @@
#include <AK/Assertions.h>
#include <AK/NonnullOwnPtr.h>
#include <AK/kmalloc.h>
-#include <LibJS/HeapBlock.h>
+#include <LibJS/Heap/HeapBlock.h>
#include <sys/mman.h>
namespace JS {
diff --git a/Libraries/LibJS/HeapBlock.h b/Libraries/LibJS/Heap/HeapBlock.h
index 2b274a8201..f1cfd2674c 100644
--- a/Libraries/LibJS/HeapBlock.h
+++ b/Libraries/LibJS/Heap/HeapBlock.h
@@ -27,8 +27,8 @@
#pragma once
#include <AK/Types.h>
-#include <LibJS/Cell.h>
#include <LibJS/Forward.h>
+#include <LibJS/Runtime/Cell.h>
namespace JS {
diff --git a/Libraries/LibJS/Interpreter.cpp b/Libraries/LibJS/Interpreter.cpp
index 5ca89f28f2..a0248c5f9e 100644
--- a/Libraries/LibJS/Interpreter.cpp
+++ b/Libraries/LibJS/Interpreter.cpp
@@ -26,13 +26,13 @@
#include <AK/Badge.h>
#include <LibJS/AST.h>
-#include <LibJS/GlobalObject.h>
#include <LibJS/Interpreter.h>
-#include <LibJS/NativeFunction.h>
-#include <LibJS/Object.h>
-#include <LibJS/ObjectPrototype.h>
-#include <LibJS/StringPrototype.h>
-#include <LibJS/Value.h>
+#include <LibJS/Runtime/GlobalObject.h>
+#include <LibJS/Runtime/NativeFunction.h>
+#include <LibJS/Runtime/Object.h>
+#include <LibJS/Runtime/ObjectPrototype.h>
+#include <LibJS/Runtime/StringPrototype.h>
+#include <LibJS/Runtime/Value.h>
namespace JS {
diff --git a/Libraries/LibJS/Interpreter.h b/Libraries/LibJS/Interpreter.h
index a3c45a831f..fe9db39d90 100644
--- a/Libraries/LibJS/Interpreter.h
+++ b/Libraries/LibJS/Interpreter.h
@@ -30,8 +30,8 @@
#include <AK/String.h>
#include <AK/Vector.h>
#include <LibJS/Forward.h>
-#include <LibJS/Heap.h>
-#include <LibJS/Value.h>
+#include <LibJS/Heap/Heap.h>
+#include <LibJS/Runtime/Value.h>
namespace JS {
diff --git a/Libraries/LibJS/Makefile b/Libraries/LibJS/Makefile
index 019c49d974..e8c7ba3877 100644
--- a/Libraries/LibJS/Makefile
+++ b/Libraries/LibJS/Makefile
@@ -1,23 +1,23 @@
OBJS = \
AST.o \
- Cell.o \
- Function.o \
- GlobalObject.o \
- Heap.o \
- HeapBlock.o \
+ Heap/Heap.o \
+ Heap/HeapBlock.o \
Interpreter.o \
Lexer.o \
- NativeFunction.o \
- NativeProperty.o \
- Object.o \
- ObjectPrototype.o \
Parser.o \
- PrimitiveString.o \
- ScriptFunction.o \
- StringObject.o \
- StringPrototype.o \
- Token.o \
- Value.o
+ Runtime/Cell.o \
+ Runtime/Function.o \
+ Runtime/GlobalObject.o \
+ Runtime/NativeFunction.o \
+ Runtime/NativeProperty.o \
+ Runtime/Object.o \
+ Runtime/ObjectPrototype.o \
+ Runtime/PrimitiveString.o \
+ Runtime/ScriptFunction.o \
+ Runtime/StringObject.o \
+ Runtime/StringPrototype.o \
+ Runtime/Value.o \
+ Token.o
LIBRARY = libjs.a
diff --git a/Libraries/LibJS/Cell.cpp b/Libraries/LibJS/Runtime/Cell.cpp
index 7a84ef64b5..222dd85502 100644
--- a/Libraries/LibJS/Cell.cpp
+++ b/Libraries/LibJS/Runtime/Cell.cpp
@@ -25,12 +25,12 @@
*/
#include <AK/LogStream.h>
-#include <LibJS/Cell.h>
-#include <LibJS/Heap.h>
-#include <LibJS/HeapBlock.h>
-#include <LibJS/Object.h>
-#include <LibJS/PrimitiveString.h>
-#include <LibJS/Value.h>
+#include <LibJS/Heap/Heap.h>
+#include <LibJS/Heap/HeapBlock.h>
+#include <LibJS/Runtime/Cell.h>
+#include <LibJS/Runtime/Object.h>
+#include <LibJS/Runtime/PrimitiveString.h>
+#include <LibJS/Runtime/Value.h>
namespace JS {
diff --git a/Libraries/LibJS/Cell.h b/Libraries/LibJS/Runtime/Cell.h
index f58ab904f1..f58ab904f1 100644
--- a/Libraries/LibJS/Cell.h
+++ b/Libraries/LibJS/Runtime/Cell.h
diff --git a/Libraries/LibJS/Function.cpp b/Libraries/LibJS/Runtime/Function.cpp
index d10dbedb43..5f3d87a25a 100644
--- a/Libraries/LibJS/Function.cpp
+++ b/Libraries/LibJS/Runtime/Function.cpp
@@ -24,8 +24,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibJS/Function.h>
-#include <LibJS/Value.h>
+#include <LibJS/Runtime/Function.h>
+#include <LibJS/Runtime/Value.h>
namespace JS {
diff --git a/Libraries/LibJS/Function.h b/Libraries/LibJS/Runtime/Function.h
index f7f5426bdc..15854d1f1c 100644
--- a/Libraries/LibJS/Function.h
+++ b/Libraries/LibJS/Runtime/Function.h
@@ -27,7 +27,7 @@
#pragma once
#include <AK/String.h>
-#include <LibJS/Object.h>
+#include <LibJS/Runtime/Object.h>
namespace JS {
diff --git a/Libraries/LibJS/GlobalObject.cpp b/Libraries/LibJS/Runtime/GlobalObject.cpp
index 396a46600d..b87b2f431b 100644
--- a/Libraries/LibJS/GlobalObject.cpp
+++ b/Libraries/LibJS/Runtime/GlobalObject.cpp
@@ -1,10 +1,11 @@
#include <AK/LogStream.h>
#include <AK/String.h>
-#include <LibJS/GlobalObject.h>
-#include <LibJS/Heap.h>
+#include <LibJS/Heap/Heap.h>
#include <LibJS/Interpreter.h>
-#include <LibJS/NativeFunction.h>
-#include <LibJS/Value.h>
+#include <LibJS/Runtime/ConsoleObject.h>
+#include <LibJS/Runtime/GlobalObject.h>
+#include <LibJS/Runtime/NativeFunction.h>
+#include <LibJS/Runtime/Value.h>
#include <stdio.h>
namespace JS {
diff --git a/Libraries/LibJS/GlobalObject.h b/Libraries/LibJS/Runtime/GlobalObject.h
index 2efdbb8ad4..3aabb4d3e2 100644
--- a/Libraries/LibJS/GlobalObject.h
+++ b/Libraries/LibJS/Runtime/GlobalObject.h
@@ -1,6 +1,6 @@
#pragma once
-#include <LibJS/Object.h>
+#include <LibJS/Runtime/Object.h>
namespace JS {
diff --git a/Libraries/LibJS/NativeFunction.cpp b/Libraries/LibJS/Runtime/NativeFunction.cpp
index 4c8330fa69..ba26635fda 100644
--- a/Libraries/LibJS/NativeFunction.cpp
+++ b/Libraries/LibJS/Runtime/NativeFunction.cpp
@@ -25,8 +25,8 @@
*/
#include <LibJS/Interpreter.h>
-#include <LibJS/NativeFunction.h>
-#include <LibJS/Value.h>
+#include <LibJS/Runtime/NativeFunction.h>
+#include <LibJS/Runtime/Value.h>
namespace JS {
diff --git a/Libraries/LibJS/NativeFunction.h b/Libraries/LibJS/Runtime/NativeFunction.h
index ae43c0a575..5c2a54d8f8 100644
--- a/Libraries/LibJS/NativeFunction.h
+++ b/Libraries/LibJS/Runtime/NativeFunction.h
@@ -27,7 +27,7 @@
#pragma once
#include <AK/Function.h>
-#include <LibJS/Function.h>
+#include <LibJS/Runtime/Function.h>
namespace JS {
diff --git a/Libraries/LibJS/NativeProperty.cpp b/Libraries/LibJS/Runtime/NativeProperty.cpp
index e0db919ce8..58ea73b9b3 100644
--- a/Libraries/LibJS/NativeProperty.cpp
+++ b/Libraries/LibJS/Runtime/NativeProperty.cpp
@@ -24,8 +24,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibJS/NativeProperty.h>
-#include <LibJS/Value.h>
+#include <LibJS/Runtime/NativeProperty.h>
+#include <LibJS/Runtime/Value.h>
namespace JS {
diff --git a/Libraries/LibJS/NativeProperty.h b/Libraries/LibJS/Runtime/NativeProperty.h
index 6406ecfb20..0044ac5a0f 100644
--- a/Libraries/LibJS/NativeProperty.h
+++ b/Libraries/LibJS/Runtime/NativeProperty.h
@@ -27,7 +27,7 @@
#pragma once
#include <AK/Function.h>
-#include <LibJS/Object.h>
+#include <LibJS/Runtime/Object.h>
namespace JS {
diff --git a/Libraries/LibJS/Object.cpp b/Libraries/LibJS/Runtime/Object.cpp
index 0ea9062548..2ddc4dfe17 100644
--- a/Libraries/LibJS/Object.cpp
+++ b/Libraries/LibJS/Runtime/Object.cpp
@@ -25,12 +25,12 @@
*/
#include <AK/String.h>
-#include <LibJS/Heap.h>
+#include <LibJS/Heap/Heap.h>
#include <LibJS/Interpreter.h>
-#include <LibJS/NativeFunction.h>
-#include <LibJS/NativeProperty.h>
-#include <LibJS/Object.h>
-#include <LibJS/Value.h>
+#include <LibJS/Runtime/NativeFunction.h>
+#include <LibJS/Runtime/NativeProperty.h>
+#include <LibJS/Runtime/Object.h>
+#include <LibJS/Runtime/Value.h>
namespace JS {
diff --git a/Libraries/LibJS/Object.h b/Libraries/LibJS/Runtime/Object.h
index eea3ee16f9..cca3c587d6 100644
--- a/Libraries/LibJS/Object.h
+++ b/Libraries/LibJS/Runtime/Object.h
@@ -28,10 +28,10 @@
#include <AK/HashMap.h>
#include <AK/String.h>
-#include <LibJS/Cell.h>
#include <LibJS/Forward.h>
-#include <LibJS/PrimitiveString.h>
-#include <LibJS/Value.h>
+#include <LibJS/Runtime/Cell.h>
+#include <LibJS/Runtime/PrimitiveString.h>
+#include <LibJS/Runtime/Value.h>
namespace JS {
diff --git a/Libraries/LibJS/ObjectPrototype.cpp b/Libraries/LibJS/Runtime/ObjectPrototype.cpp
index 608976f52e..688a5025f5 100644
--- a/Libraries/LibJS/ObjectPrototype.cpp
+++ b/Libraries/LibJS/Runtime/ObjectPrototype.cpp
@@ -26,10 +26,10 @@
#include <AK/Function.h>
#include <AK/String.h>
-#include <LibJS/Heap.h>
+#include <LibJS/Heap/Heap.h>
#include <LibJS/Interpreter.h>
-#include <LibJS/ObjectPrototype.h>
-#include <LibJS/Value.h>
+#include <LibJS/Runtime/ObjectPrototype.h>
+#include <LibJS/Runtime/Value.h>
namespace JS {
diff --git a/Libraries/LibJS/ObjectPrototype.h b/Libraries/LibJS/Runtime/ObjectPrototype.h
index 9833c0f9bd..704e0322e3 100644
--- a/Libraries/LibJS/ObjectPrototype.h
+++ b/Libraries/LibJS/Runtime/ObjectPrototype.h
@@ -26,7 +26,7 @@
#pragma once
-#include <LibJS/Object.h>
+#include <LibJS/Runtime/Object.h>
namespace JS {
diff --git a/Libraries/LibJS/PrimitiveString.cpp b/Libraries/LibJS/Runtime/PrimitiveString.cpp
index 828e252ccc..cfba8c8872 100644
--- a/Libraries/LibJS/PrimitiveString.cpp
+++ b/Libraries/LibJS/Runtime/PrimitiveString.cpp
@@ -24,8 +24,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibJS/Heap.h>
-#include <LibJS/PrimitiveString.h>
+#include <LibJS/Heap/Heap.h>
+#include <LibJS/Runtime/PrimitiveString.h>
namespace JS {
diff --git a/Libraries/LibJS/PrimitiveString.h b/Libraries/LibJS/Runtime/PrimitiveString.h
index 16932bef39..6e9f9539d3 100644
--- a/Libraries/LibJS/PrimitiveString.h
+++ b/Libraries/LibJS/Runtime/PrimitiveString.h
@@ -27,7 +27,7 @@
#pragma once
#include <AK/String.h>
-#include <LibJS/Cell.h>
+#include <LibJS/Runtime/Cell.h>
namespace JS {
diff --git a/Libraries/LibJS/ScriptFunction.cpp b/Libraries/LibJS/Runtime/ScriptFunction.cpp
index 05e56f2b52..f8833a4ec6 100644
--- a/Libraries/LibJS/ScriptFunction.cpp
+++ b/Libraries/LibJS/Runtime/ScriptFunction.cpp
@@ -25,8 +25,8 @@
*/
#include <LibJS/Interpreter.h>
-#include <LibJS/ScriptFunction.h>
-#include <LibJS/Value.h>
+#include <LibJS/Runtime/ScriptFunction.h>
+#include <LibJS/Runtime/Value.h>
namespace JS {
diff --git a/Libraries/LibJS/ScriptFunction.h b/Libraries/LibJS/Runtime/ScriptFunction.h
index 910ae8222f..76ac8e1b69 100644
--- a/Libraries/LibJS/ScriptFunction.h
+++ b/Libraries/LibJS/Runtime/ScriptFunction.h
@@ -26,7 +26,7 @@
#pragma once
-#include <LibJS/Function.h>
+#include <LibJS/Runtime/Function.h>
namespace JS {
diff --git a/Libraries/LibJS/StringObject.cpp b/Libraries/LibJS/Runtime/StringObject.cpp
index 607d7f6917..2d6c76c580 100644
--- a/Libraries/LibJS/StringObject.cpp
+++ b/Libraries/LibJS/Runtime/StringObject.cpp
@@ -24,12 +24,12 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibJS/Heap.h>
+#include <LibJS/Heap/Heap.h>
#include <LibJS/Interpreter.h>
-#include <LibJS/PrimitiveString.h>
-#include <LibJS/StringObject.h>
-#include <LibJS/StringPrototype.h>
-#include <LibJS/Value.h>
+#include <LibJS/Runtime/PrimitiveString.h>
+#include <LibJS/Runtime/StringObject.h>
+#include <LibJS/Runtime/StringPrototype.h>
+#include <LibJS/Runtime/Value.h>
namespace JS {
diff --git a/Libraries/LibJS/StringObject.h b/Libraries/LibJS/Runtime/StringObject.h
index 5bfb380226..76f05bbcce 100644
--- a/Libraries/LibJS/StringObject.h
+++ b/Libraries/LibJS/Runtime/StringObject.h
@@ -26,7 +26,7 @@
#pragma once
-#include <LibJS/Object.h>
+#include <LibJS/Runtime/Object.h>
namespace JS {
diff --git a/Libraries/LibJS/StringPrototype.cpp b/Libraries/LibJS/Runtime/StringPrototype.cpp
index d359cfdf4a..dabb8cccda 100644
--- a/Libraries/LibJS/StringPrototype.cpp
+++ b/Libraries/LibJS/Runtime/StringPrototype.cpp
@@ -26,12 +26,12 @@
#include <AK/Function.h>
#include <AK/StringBuilder.h>
-#include <LibJS/Heap.h>
+#include <LibJS/Heap/Heap.h>
#include <LibJS/Interpreter.h>
-#include <LibJS/PrimitiveString.h>
-#include <LibJS/StringObject.h>
-#include <LibJS/StringPrototype.h>
-#include <LibJS/Value.h>
+#include <LibJS/Runtime/PrimitiveString.h>
+#include <LibJS/Runtime/StringObject.h>
+#include <LibJS/Runtime/StringPrototype.h>
+#include <LibJS/Runtime/Value.h>
namespace JS {
diff --git a/Libraries/LibJS/StringPrototype.h b/Libraries/LibJS/Runtime/StringPrototype.h
index 1d87dbb866..51cdedd73b 100644
--- a/Libraries/LibJS/StringPrototype.h
+++ b/Libraries/LibJS/Runtime/StringPrototype.h
@@ -26,7 +26,7 @@
#pragma once
-#include <LibJS/Object.h>
+#include <LibJS/Runtime/Object.h>
namespace JS {
diff --git a/Libraries/LibJS/Value.cpp b/Libraries/LibJS/Runtime/Value.cpp
index ce84a77f74..a865ba3048 100644
--- a/Libraries/LibJS/Value.cpp
+++ b/Libraries/LibJS/Runtime/Value.cpp
@@ -25,11 +25,11 @@
*/
#include <AK/String.h>
-#include <LibJS/Heap.h>
-#include <LibJS/Object.h>
-#include <LibJS/PrimitiveString.h>
-#include <LibJS/StringObject.h>
-#include <LibJS/Value.h>
+#include <LibJS/Heap/Heap.h>
+#include <LibJS/Runtime/Object.h>
+#include <LibJS/Runtime/PrimitiveString.h>
+#include <LibJS/Runtime/StringObject.h>
+#include <LibJS/Runtime/Value.h>
namespace JS {
diff --git a/Libraries/LibJS/Value.h b/Libraries/LibJS/Runtime/Value.h
index ada26761c6..ada26761c6 100644
--- a/Libraries/LibJS/Value.h
+++ b/Libraries/LibJS/Runtime/Value.h
diff --git a/Libraries/LibWeb/Bindings/DocumentWrapper.cpp b/Libraries/LibWeb/Bindings/DocumentWrapper.cpp
index 27d202ad59..be4e404d79 100644
--- a/Libraries/LibWeb/Bindings/DocumentWrapper.cpp
+++ b/Libraries/LibWeb/Bindings/DocumentWrapper.cpp
@@ -24,8 +24,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibJS/PrimitiveString.h>
-#include <LibJS/Value.h>
+#include <LibJS/Runtime/PrimitiveString.h>
+#include <LibJS/Runtime/Value.h>
#include <LibWeb/Bindings/DocumentWrapper.h>
#include <LibWeb/DOM/Document.h>
#include <LibWeb/DOM/Element.h>
diff --git a/Libraries/LibWeb/Bindings/NodeWrapper.cpp b/Libraries/LibWeb/Bindings/NodeWrapper.cpp
index c2b8e34627..0fe5269391 100644
--- a/Libraries/LibWeb/Bindings/NodeWrapper.cpp
+++ b/Libraries/LibWeb/Bindings/NodeWrapper.cpp
@@ -24,8 +24,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <LibJS/PrimitiveString.h>
-#include <LibJS/Value.h>
+#include <LibJS/Runtime/PrimitiveString.h>
+#include <LibJS/Runtime/Value.h>
#include <LibWeb/Bindings/NodeWrapper.h>
#include <LibWeb/DOM/Node.h>
diff --git a/Libraries/LibWeb/Bindings/Wrappable.h b/Libraries/LibWeb/Bindings/Wrappable.h
index 9215b9c0fc..35073f4333 100644
--- a/Libraries/LibWeb/Bindings/Wrappable.h
+++ b/Libraries/LibWeb/Bindings/Wrappable.h
@@ -27,7 +27,7 @@
#pragma once
#include <AK/WeakPtr.h>
-#include <LibJS/Heap.h>
+#include <LibJS/Heap/Heap.h>
#include <LibWeb/Forward.h>
namespace Web {
diff --git a/Libraries/LibWeb/Bindings/Wrapper.h b/Libraries/LibWeb/Bindings/Wrapper.h
index 9c642b8ecb..be7db5ace1 100644
--- a/Libraries/LibWeb/Bindings/Wrapper.h
+++ b/Libraries/LibWeb/Bindings/Wrapper.h
@@ -28,7 +28,7 @@
#include <AK/NonnullRefPtr.h>
#include <AK/Weakable.h>
-#include <LibJS/Object.h>
+#include <LibJS/Runtime/Object.h>
#include <LibWeb/Forward.h>
namespace Web {
diff --git a/Libraries/LibWeb/DOM/Document.cpp b/Libraries/LibWeb/DOM/Document.cpp
index 490003e26f..881eead162 100644
--- a/Libraries/LibWeb/DOM/Document.cpp
+++ b/Libraries/LibWeb/DOM/Document.cpp
@@ -29,8 +29,8 @@
#include <LibCore/Timer.h>
#include <LibGUI/Application.h>
#include <LibGUI/MessageBox.h>
-#include <LibJS/GlobalObject.h>
#include <LibJS/Interpreter.h>
+#include <LibJS/Runtime/GlobalObject.h>
#include <LibWeb/Bindings/DocumentWrapper.h>
#include <LibWeb/CSS/StyleResolver.h>
#include <LibWeb/DOM/Document.h>
diff --git a/Userland/js.cpp b/Userland/js.cpp
index 4194d7db64..9725bcbf90 100644
--- a/Userland/js.cpp
+++ b/Userland/js.cpp
@@ -30,10 +30,10 @@
#include <LibCore/File.h>
#include <LibJS/AST.h>
#include <LibJS/Interpreter.h>
-#include <LibJS/Object.h>
#include <LibJS/Parser.h>
-#include <LibJS/PrimitiveString.h>
-#include <LibJS/Value.h>
+#include <LibJS/Runtime/Object.h>
+#include <LibJS/Runtime/PrimitiveString.h>
+#include <LibJS/Runtime/Value.h>
#include <stdio.h>
#define PROGRAM 6