diff --git a/SConstruct b/SConstruct
index 5d70a66..8a29e1d 100644
--- a/SConstruct
+++ b/SConstruct
@@ -19,7 +19,6 @@ env.Append(CPPDEFINES = ['BASTL_EXTENSIONS=1'])
 # env.Append(CCFLAGS = ['-O2'])
 
 env['ISO_FILES'] = []
-env = SConscript('bastl/SConscript', exports = 'env')
 env = SConscript('targets/_any/SConscript', exports = 'env')
 env = SConscript(f'targets/{target}/SConscript', exports = 'env')
 
diff --git a/targets/_any/SConscript b/targets/_any/SConscript
index 73ab27a..006dbfb 100644
--- a/targets/_any/SConscript
+++ b/targets/_any/SConscript
@@ -8,6 +8,7 @@ any_target_sources = Split('''
 
 env.Append(KERNEL_SOURCES = [env.File(f) for f in any_target_sources])
 
+env = SConscript('bastl/SConscript', exports = 'env')
 env = SConscript('kernel/SConscript', exports = 'env')
 env = SConscript('stdlib/SConscript', exports = 'env')
 
diff --git a/bastl/SConscript b/targets/_any/bastl/SConscript
similarity index 100%
rename from bastl/SConscript
rename to targets/_any/bastl/SConscript
diff --git a/bastl/include/algorithm b/targets/_any/bastl/include/algorithm
similarity index 100%
rename from bastl/include/algorithm
rename to targets/_any/bastl/include/algorithm
diff --git a/bastl/include/array b/targets/_any/bastl/include/array
similarity index 100%
rename from bastl/include/array
rename to targets/_any/bastl/include/array
diff --git a/bastl/include/bit b/targets/_any/bastl/include/bit
similarity index 100%
rename from bastl/include/bit
rename to targets/_any/bastl/include/bit
diff --git a/bastl/include/cassert b/targets/_any/bastl/include/cassert
similarity index 100%
rename from bastl/include/cassert
rename to targets/_any/bastl/include/cassert
diff --git a/bastl/include/cfloat b/targets/_any/bastl/include/cfloat
similarity index 100%
rename from bastl/include/cfloat
rename to targets/_any/bastl/include/cfloat
diff --git a/bastl/include/climits b/targets/_any/bastl/include/climits
similarity index 100%
rename from bastl/include/climits
rename to targets/_any/bastl/include/climits
diff --git a/bastl/include/cmath b/targets/_any/bastl/include/cmath
similarity index 100%
rename from bastl/include/cmath
rename to targets/_any/bastl/include/cmath
diff --git a/bastl/include/cstdarg b/targets/_any/bastl/include/cstdarg
similarity index 100%
rename from bastl/include/cstdarg
rename to targets/_any/bastl/include/cstdarg
diff --git a/bastl/include/cstddef b/targets/_any/bastl/include/cstddef
similarity index 100%
rename from bastl/include/cstddef
rename to targets/_any/bastl/include/cstddef
diff --git a/bastl/include/cstdint b/targets/_any/bastl/include/cstdint
similarity index 100%
rename from bastl/include/cstdint
rename to targets/_any/bastl/include/cstdint
diff --git a/bastl/include/cstdio b/targets/_any/bastl/include/cstdio
similarity index 100%
rename from bastl/include/cstdio
rename to targets/_any/bastl/include/cstdio
diff --git a/bastl/include/cstdlib b/targets/_any/bastl/include/cstdlib
similarity index 100%
rename from bastl/include/cstdlib
rename to targets/_any/bastl/include/cstdlib
diff --git a/bastl/include/cstring b/targets/_any/bastl/include/cstring
similarity index 100%
rename from bastl/include/cstring
rename to targets/_any/bastl/include/cstring
diff --git a/bastl/include/exception b/targets/_any/bastl/include/exception
similarity index 100%
rename from bastl/include/exception
rename to targets/_any/bastl/include/exception
diff --git a/bastl/include/initializer_list b/targets/_any/bastl/include/initializer_list
similarity index 100%
rename from bastl/include/initializer_list
rename to targets/_any/bastl/include/initializer_list
diff --git a/bastl/include/iterator b/targets/_any/bastl/include/iterator
similarity index 100%
rename from bastl/include/iterator
rename to targets/_any/bastl/include/iterator
diff --git a/bastl/include/limits b/targets/_any/bastl/include/limits
similarity index 100%
rename from bastl/include/limits
rename to targets/_any/bastl/include/limits
diff --git a/bastl/include/memory b/targets/_any/bastl/include/memory
similarity index 100%
rename from bastl/include/memory
rename to targets/_any/bastl/include/memory
diff --git a/bastl/include/new b/targets/_any/bastl/include/new
similarity index 100%
rename from bastl/include/new
rename to targets/_any/bastl/include/new
diff --git a/bastl/include/span b/targets/_any/bastl/include/span
similarity index 100%
rename from bastl/include/span
rename to targets/_any/bastl/include/span
diff --git a/bastl/include/stdexcept b/targets/_any/bastl/include/stdexcept
similarity index 100%
rename from bastl/include/stdexcept
rename to targets/_any/bastl/include/stdexcept
diff --git a/bastl/include/string b/targets/_any/bastl/include/string
similarity index 100%
rename from bastl/include/string
rename to targets/_any/bastl/include/string
diff --git a/bastl/include/type_traits b/targets/_any/bastl/include/type_traits
similarity index 100%
rename from bastl/include/type_traits
rename to targets/_any/bastl/include/type_traits
diff --git a/bastl/include/utility b/targets/_any/bastl/include/utility
similarity index 100%
rename from bastl/include/utility
rename to targets/_any/bastl/include/utility
diff --git a/bastl/include/vector b/targets/_any/bastl/include/vector
similarity index 100%
rename from bastl/include/vector
rename to targets/_any/bastl/include/vector
diff --git a/bastl/src/exception.cpp b/targets/_any/bastl/src/exception.cpp
similarity index 100%
rename from bastl/src/exception.cpp
rename to targets/_any/bastl/src/exception.cpp
diff --git a/bastl/src/new.cpp b/targets/_any/bastl/src/new.cpp
similarity index 100%
rename from bastl/src/new.cpp
rename to targets/_any/bastl/src/new.cpp
diff --git a/targets/i686/SConscript b/targets/i686/SConscript
index 3d73cd2..433b2e2 100644
--- a/targets/i686/SConscript
+++ b/targets/i686/SConscript
@@ -9,7 +9,7 @@ kernel_env['LD'] = 'i686-elf-g++'
 kernel_env.Append(CFLAGS = ['-ffreestanding'])
 kernel_env.Append(CXXFLAGS = ['-ffreestanding', '-fno-exceptions', '-fno-rtti', '-std=c++20'])
 kernel_env.Append(LINKFLAGS = ['-T', kernel_env.File('linker.ld').abspath, '-ffreestanding', '-nostdlib'])
-kernel_env.Append(CPPPATH = ['#targets/_any/include', '#bastl/include'])
+kernel_env.Append(CPPPATH = ['#targets/_any/include', '#targets/_any/bastl/include'])
 
 def get_crt_object(name: str) -> str:
     import subprocess
diff --git a/targets/x86_64/SConscript b/targets/x86_64/SConscript
index 59bc395..f1e0cf2 100644
--- a/targets/x86_64/SConscript
+++ b/targets/x86_64/SConscript
@@ -11,7 +11,7 @@ kernel_env.Append(CFLAGS = ['-ffreestanding'])
 kernel_env.Append(CPPDEFINES = ['__baos_kernel_source__=1'])
 kernel_env.Append(CXXFLAGS = ['-ffreestanding', '-fno-exceptions', '-fno-rtti', '-std=c++20'])
 kernel_env.Append(LINKFLAGS = ['-T', kernel_env.File('linker.ld').abspath, '-ffreestanding', '-nostdlib', '-mcmodel=large', '-mno-red-zone', '-mno-mmx', '-mno-sse', '-mno-sse2'])
-kernel_env.Append(CPPPATH = ['#targets/_any/include', '#bastl/include', 'include', '/usr/include/efi', '#targets/_any/kernel/include', '#targets/_any/stdlib/include'])
+kernel_env.Append(CPPPATH = ['#targets/_any/include', '#targets/_any/bastl/include', 'include', '/usr/include/efi', '#targets/_any/kernel/include', '#targets/_any/stdlib/include'])
 
 def get_crt_object(name: str) -> str:
     import subprocess