diff --git a/.licenserc.yaml b/.licenserc.yaml index 297579ed..ba31cfd3 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -14,7 +14,7 @@ header: - '**/Dockerfile.*' paths-ignore: # These directories are licensed under licenses other than MPL-2.0. - - 'services/libs/comp-sys/cargo-component' + - 'kernel/libs/comp-sys/cargo-component' - 'framework/libs/tdx-guest' license: content: | @@ -40,7 +40,7 @@ header: # Files under cargo-component are licensed under Apache-2.0 or MIT license. - paths: - - 'services/libs/comp-sys/cargo-component/**' + - 'kernel/libs/comp-sys/cargo-component/**' paths-ignore: - '**/*.md' - '**/*.toml' diff --git a/Cargo.toml b/Cargo.toml index 82efdd68..be341832 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,30 +1,3 @@ -[package] -name = "asterinas" -version = "0.4.0" -edition = "2021" - -[dependencies] -aster-frame = { path = "framework/aster-frame" } -aster-nix = { path = "services/aster-nix" } -component = { path = "services/libs/comp-sys/component" } - -[dev-dependencies] -x86_64 = "0.14.2" -aster-time = { path = "services/comps/time" } -aster-framebuffer = { path = "services/comps/framebuffer" } - -[profile.dev] -opt-level = 0 -debug = true -lto = false -panic = "unwind" - -[profile.release] -opt-level = 3 -debug = false -lto = false -panic = "unwind" - [workspace] members = [ @@ -36,33 +9,31 @@ members = [ "framework/libs/linux-bzimage/setup", "framework/libs/ktest", "framework/libs/tdx-guest", - "services/aster-nix", - "services/comps/block", - "services/comps/console", - "services/comps/framebuffer", - "services/comps/input", - "services/comps/network", - "services/comps/time", - "services/comps/virtio", - "services/libs/cpio-decoder", - "services/libs/int-to-c-enum", - "services/libs/int-to-c-enum/derive", - "services/libs/aster-rights", - "services/libs/aster-rights-proc", - "services/libs/aster-util", - "services/libs/keyable-arc", - "services/libs/typeflags", - "services/libs/typeflags-util", + "kernel", + "kernel/aster-nix", + "kernel/comps/block", + "kernel/comps/console", + "kernel/comps/framebuffer", + "kernel/comps/input", + "kernel/comps/network", + "kernel/comps/time", + "kernel/comps/virtio", + "kernel/libs/cpio-decoder", + "kernel/libs/int-to-c-enum", + "kernel/libs/int-to-c-enum/derive", + "kernel/libs/aster-rights", + "kernel/libs/aster-rights-proc", + "kernel/libs/aster-util", + "kernel/libs/keyable-arc", + "kernel/libs/typeflags", + "kernel/libs/typeflags-util", ] exclude = [ "osdk", "target/osdk/base", - "services/libs/comp-sys/cargo-component", - "services/libs/comp-sys/component", - "services/libs/comp-sys/component-macro", - "services/libs/comp-sys/controlled", + "kernel/libs/comp-sys/cargo-component", + "kernel/libs/comp-sys/component", + "kernel/libs/comp-sys/component-macro", + "kernel/libs/comp-sys/controlled", ] - -[features] -intel_tdx = ["aster-frame/intel_tdx", "aster-nix/intel_tdx"] diff --git a/Makefile b/Makefile index 82cbbca7..093a4c69 100644 --- a/Makefile +++ b/Makefile @@ -71,26 +71,26 @@ USERMODE_TESTABLE := \ framework/libs/linux-bzimage/boot-params \ framework/libs/ktest \ framework/libs/ktest-proc-macro \ - services/libs/cpio-decoder \ - services/libs/int-to-c-enum \ - services/libs/int-to-c-enum/derive \ - services/libs/aster-rights \ - services/libs/aster-rights-proc \ - services/libs/keyable-arc \ - services/libs/typeflags \ - services/libs/typeflags-util + kernel/libs/cpio-decoder \ + kernel/libs/int-to-c-enum \ + kernel/libs/int-to-c-enum/derive \ + kernel/libs/aster-rights \ + kernel/libs/aster-rights-proc \ + kernel/libs/keyable-arc \ + kernel/libs/typeflags \ + kernel/libs/typeflags-util # Maintain a list of kernel crates that can be tested with `cargo osdk test` # The framework is tested independently, thus not included here KTEST_TESTABLE := \ - "services/aster-nix" \ - "services/comps/block" \ - "services/comps/console" \ - "services/comps/framebuffer" \ - "services/comps/input" \ - "services/comps/network" \ - "services/comps/time" \ - "services/comps/virtio" + "kernel/aster-nix" \ + "kernel/comps/block" \ + "kernel/comps/console" \ + "kernel/comps/framebuffer" \ + "kernel/comps/input" \ + "kernel/comps/network" \ + "kernel/comps/time" \ + "kernel/comps/virtio" .PHONY: all install_osdk build tools run test docs check clean update_initramfs @@ -101,13 +101,13 @@ install_osdk: build: @make --no-print-directory -C regression - @cargo osdk build $(CARGO_OSDK_ARGS) + @cd kernel && cargo osdk build $(CARGO_OSDK_ARGS) tools: - @cd services/libs/comp-sys && cargo install --path cargo-component + @cd kernel/libs/comp-sys && cargo install --path cargo-component run: build - @cargo osdk run $(CARGO_OSDK_ARGS) + @cd kernel && cargo osdk run $(CARGO_OSDK_ARGS) test: @for dir in $(USERMODE_TESTABLE); do \ diff --git a/README.md b/README.md index 6498dbbe..7ac2a6ce 100644 --- a/README.md +++ b/README.md @@ -65,8 +65,8 @@ make install_osdk 4. Inside the container, go to the project folder to build and run Asterinas. ```bash -cargo osdk build -cargo osdk run +make build +make run ``` If everything goes well, Asterinas is now up and running inside a VM. diff --git a/README_CN.md b/README_CN.md index f715f9dc..5500ee47 100644 --- a/README_CN.md +++ b/README_CN.md @@ -59,8 +59,8 @@ make install_osdk 4. 在容器内，进入项目文件夹构建并运行星绽。 ```bash -cargo osdk build -cargo osdk run +make build +make run ``` 如果一切顺利，星绽现在应该在一个虚拟机内运行起来了。 diff --git a/framework/aster-frame/Cargo.toml b/framework/aster-frame/Cargo.toml index 694cce44..d1caa1f1 100644 --- a/framework/aster-frame/Cargo.toml +++ b/framework/aster-frame/Cargo.toml @@ -16,7 +16,7 @@ buddy_system_allocator = "0.9.0" cfg-if = "1.0" gimli = { version = "0.28", default-features = false, features = ["read-core"] } inherit-methods-macro = { git = "https://github.com/asterinas/inherit-methods-macro", rev = "98f7e3e" } -int-to-c-enum = { path = "../../services/libs/int-to-c-enum" } +int-to-c-enum = { path = "../../kernel/libs/int-to-c-enum" } intrusive-collections = "0.9.5" ktest = { path = "../libs/ktest" } lazy_static = { version = "1.0", features = ["spin_no_std"] } diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml new file mode 100644 index 00000000..7a5e8163 --- /dev/null +++ b/kernel/Cargo.toml @@ -0,0 +1,29 @@ +[package] +name = "asterinas" +version = "0.4.0" +edition = "2021" + +[dependencies] +aster-frame = { path = "../framework/aster-frame" } +aster-nix = { path = "aster-nix" } +component = { path = "libs/comp-sys/component" } + +[dev-dependencies] +x86_64 = "0.14.2" +aster-time = { path = "comps/time" } +aster-framebuffer = { path = "comps/framebuffer" } + +[profile.dev] +opt-level = 0 +debug = true +lto = false +panic = "unwind" + +[profile.release] +opt-level = 3 +debug = false +lto = false +panic = "unwind" + +[features] +intel_tdx = ["aster-frame/intel_tdx", "aster-nix/intel_tdx"] diff --git a/services/aster-nix/Cargo.toml b/kernel/aster-nix/Cargo.toml similarity index 100% rename from services/aster-nix/Cargo.toml rename to kernel/aster-nix/Cargo.toml diff --git a/services/aster-nix/src/console.rs b/kernel/aster-nix/src/console.rs similarity index 100% rename from services/aster-nix/src/console.rs rename to kernel/aster-nix/src/console.rs diff --git a/services/aster-nix/src/device/mod.rs b/kernel/aster-nix/src/device/mod.rs similarity index 100% rename from services/aster-nix/src/device/mod.rs rename to kernel/aster-nix/src/device/mod.rs diff --git a/services/aster-nix/src/device/null.rs b/kernel/aster-nix/src/device/null.rs similarity index 100% rename from services/aster-nix/src/device/null.rs rename to kernel/aster-nix/src/device/null.rs diff --git a/services/aster-nix/src/device/pty/mod.rs b/kernel/aster-nix/src/device/pty/mod.rs similarity index 100% rename from services/aster-nix/src/device/pty/mod.rs rename to kernel/aster-nix/src/device/pty/mod.rs diff --git a/services/aster-nix/src/device/pty/pty.rs b/kernel/aster-nix/src/device/pty/pty.rs similarity index 100% rename from services/aster-nix/src/device/pty/pty.rs rename to kernel/aster-nix/src/device/pty/pty.rs diff --git a/services/aster-nix/src/device/random.rs b/kernel/aster-nix/src/device/random.rs similarity index 100% rename from services/aster-nix/src/device/random.rs rename to kernel/aster-nix/src/device/random.rs diff --git a/services/aster-nix/src/device/tdxguest/mod.rs b/kernel/aster-nix/src/device/tdxguest/mod.rs similarity index 100% rename from services/aster-nix/src/device/tdxguest/mod.rs rename to kernel/aster-nix/src/device/tdxguest/mod.rs diff --git a/services/aster-nix/src/device/tty/device.rs b/kernel/aster-nix/src/device/tty/device.rs similarity index 100% rename from services/aster-nix/src/device/tty/device.rs rename to kernel/aster-nix/src/device/tty/device.rs diff --git a/services/aster-nix/src/device/tty/driver.rs b/kernel/aster-nix/src/device/tty/driver.rs similarity index 100% rename from services/aster-nix/src/device/tty/driver.rs rename to kernel/aster-nix/src/device/tty/driver.rs diff --git a/services/aster-nix/src/device/tty/line_discipline.rs b/kernel/aster-nix/src/device/tty/line_discipline.rs similarity index 100% rename from services/aster-nix/src/device/tty/line_discipline.rs rename to kernel/aster-nix/src/device/tty/line_discipline.rs diff --git a/services/aster-nix/src/device/tty/mod.rs b/kernel/aster-nix/src/device/tty/mod.rs similarity index 100% rename from services/aster-nix/src/device/tty/mod.rs rename to kernel/aster-nix/src/device/tty/mod.rs diff --git a/services/aster-nix/src/device/tty/termio.rs b/kernel/aster-nix/src/device/tty/termio.rs similarity index 100% rename from services/aster-nix/src/device/tty/termio.rs rename to kernel/aster-nix/src/device/tty/termio.rs diff --git a/services/aster-nix/src/device/urandom.rs b/kernel/aster-nix/src/device/urandom.rs similarity index 100% rename from services/aster-nix/src/device/urandom.rs rename to kernel/aster-nix/src/device/urandom.rs diff --git a/services/aster-nix/src/device/zero.rs b/kernel/aster-nix/src/device/zero.rs similarity index 100% rename from services/aster-nix/src/device/zero.rs rename to kernel/aster-nix/src/device/zero.rs diff --git a/services/aster-nix/src/driver/mod.rs b/kernel/aster-nix/src/driver/mod.rs similarity index 100% rename from services/aster-nix/src/driver/mod.rs rename to kernel/aster-nix/src/driver/mod.rs diff --git a/services/aster-nix/src/error.rs b/kernel/aster-nix/src/error.rs similarity index 100% rename from services/aster-nix/src/error.rs rename to kernel/aster-nix/src/error.rs diff --git a/services/aster-nix/src/events/events.rs b/kernel/aster-nix/src/events/events.rs similarity index 100% rename from services/aster-nix/src/events/events.rs rename to kernel/aster-nix/src/events/events.rs diff --git a/services/aster-nix/src/events/io_events.rs b/kernel/aster-nix/src/events/io_events.rs similarity index 100% rename from services/aster-nix/src/events/io_events.rs rename to kernel/aster-nix/src/events/io_events.rs diff --git a/services/aster-nix/src/events/mod.rs b/kernel/aster-nix/src/events/mod.rs similarity index 100% rename from services/aster-nix/src/events/mod.rs rename to kernel/aster-nix/src/events/mod.rs diff --git a/services/aster-nix/src/events/observer.rs b/kernel/aster-nix/src/events/observer.rs similarity index 100% rename from services/aster-nix/src/events/observer.rs rename to kernel/aster-nix/src/events/observer.rs diff --git a/services/aster-nix/src/events/subject.rs b/kernel/aster-nix/src/events/subject.rs similarity index 100% rename from services/aster-nix/src/events/subject.rs rename to kernel/aster-nix/src/events/subject.rs diff --git a/services/aster-nix/src/fs/device.rs b/kernel/aster-nix/src/fs/device.rs similarity index 100% rename from services/aster-nix/src/fs/device.rs rename to kernel/aster-nix/src/fs/device.rs diff --git a/services/aster-nix/src/fs/devpts/mod.rs b/kernel/aster-nix/src/fs/devpts/mod.rs similarity index 100% rename from services/aster-nix/src/fs/devpts/mod.rs rename to kernel/aster-nix/src/fs/devpts/mod.rs diff --git a/services/aster-nix/src/fs/devpts/ptmx.rs b/kernel/aster-nix/src/fs/devpts/ptmx.rs similarity index 100% rename from services/aster-nix/src/fs/devpts/ptmx.rs rename to kernel/aster-nix/src/fs/devpts/ptmx.rs diff --git a/services/aster-nix/src/fs/devpts/slave.rs b/kernel/aster-nix/src/fs/devpts/slave.rs similarity index 100% rename from services/aster-nix/src/fs/devpts/slave.rs rename to kernel/aster-nix/src/fs/devpts/slave.rs diff --git a/services/aster-nix/src/fs/epoll/epoll_file.rs b/kernel/aster-nix/src/fs/epoll/epoll_file.rs similarity index 100% rename from services/aster-nix/src/fs/epoll/epoll_file.rs rename to kernel/aster-nix/src/fs/epoll/epoll_file.rs diff --git a/services/aster-nix/src/fs/epoll/mod.rs b/kernel/aster-nix/src/fs/epoll/mod.rs similarity index 100% rename from services/aster-nix/src/fs/epoll/mod.rs rename to kernel/aster-nix/src/fs/epoll/mod.rs diff --git a/services/aster-nix/src/fs/ext2/block_group.rs b/kernel/aster-nix/src/fs/ext2/block_group.rs similarity index 100% rename from services/aster-nix/src/fs/ext2/block_group.rs rename to kernel/aster-nix/src/fs/ext2/block_group.rs diff --git a/services/aster-nix/src/fs/ext2/blocks_hole.rs b/kernel/aster-nix/src/fs/ext2/blocks_hole.rs similarity index 100% rename from services/aster-nix/src/fs/ext2/blocks_hole.rs rename to kernel/aster-nix/src/fs/ext2/blocks_hole.rs diff --git a/services/aster-nix/src/fs/ext2/dir.rs b/kernel/aster-nix/src/fs/ext2/dir.rs similarity index 100% rename from services/aster-nix/src/fs/ext2/dir.rs rename to kernel/aster-nix/src/fs/ext2/dir.rs diff --git a/services/aster-nix/src/fs/ext2/fs.rs b/kernel/aster-nix/src/fs/ext2/fs.rs similarity index 100% rename from services/aster-nix/src/fs/ext2/fs.rs rename to kernel/aster-nix/src/fs/ext2/fs.rs diff --git a/services/aster-nix/src/fs/ext2/impl_for_vfs/fs.rs b/kernel/aster-nix/src/fs/ext2/impl_for_vfs/fs.rs similarity index 100% rename from services/aster-nix/src/fs/ext2/impl_for_vfs/fs.rs rename to kernel/aster-nix/src/fs/ext2/impl_for_vfs/fs.rs diff --git a/services/aster-nix/src/fs/ext2/impl_for_vfs/inode.rs b/kernel/aster-nix/src/fs/ext2/impl_for_vfs/inode.rs similarity index 100% rename from services/aster-nix/src/fs/ext2/impl_for_vfs/inode.rs rename to kernel/aster-nix/src/fs/ext2/impl_for_vfs/inode.rs diff --git a/services/aster-nix/src/fs/ext2/impl_for_vfs/mod.rs b/kernel/aster-nix/src/fs/ext2/impl_for_vfs/mod.rs similarity index 100% rename from services/aster-nix/src/fs/ext2/impl_for_vfs/mod.rs rename to kernel/aster-nix/src/fs/ext2/impl_for_vfs/mod.rs diff --git a/services/aster-nix/src/fs/ext2/inode.rs b/kernel/aster-nix/src/fs/ext2/inode.rs similarity index 100% rename from services/aster-nix/src/fs/ext2/inode.rs rename to kernel/aster-nix/src/fs/ext2/inode.rs diff --git a/services/aster-nix/src/fs/ext2/mod.rs b/kernel/aster-nix/src/fs/ext2/mod.rs similarity index 100% rename from services/aster-nix/src/fs/ext2/mod.rs rename to kernel/aster-nix/src/fs/ext2/mod.rs diff --git a/services/aster-nix/src/fs/ext2/prelude.rs b/kernel/aster-nix/src/fs/ext2/prelude.rs similarity index 100% rename from services/aster-nix/src/fs/ext2/prelude.rs rename to kernel/aster-nix/src/fs/ext2/prelude.rs diff --git a/services/aster-nix/src/fs/ext2/super_block.rs b/kernel/aster-nix/src/fs/ext2/super_block.rs similarity index 100% rename from services/aster-nix/src/fs/ext2/super_block.rs rename to kernel/aster-nix/src/fs/ext2/super_block.rs diff --git a/services/aster-nix/src/fs/ext2/utils.rs b/kernel/aster-nix/src/fs/ext2/utils.rs similarity index 100% rename from services/aster-nix/src/fs/ext2/utils.rs rename to kernel/aster-nix/src/fs/ext2/utils.rs diff --git a/services/aster-nix/src/fs/file_handle.rs b/kernel/aster-nix/src/fs/file_handle.rs similarity index 100% rename from services/aster-nix/src/fs/file_handle.rs rename to kernel/aster-nix/src/fs/file_handle.rs diff --git a/services/aster-nix/src/fs/file_table.rs b/kernel/aster-nix/src/fs/file_table.rs similarity index 100% rename from services/aster-nix/src/fs/file_table.rs rename to kernel/aster-nix/src/fs/file_table.rs diff --git a/services/aster-nix/src/fs/fs_resolver.rs b/kernel/aster-nix/src/fs/fs_resolver.rs similarity index 100% rename from services/aster-nix/src/fs/fs_resolver.rs rename to kernel/aster-nix/src/fs/fs_resolver.rs diff --git a/services/aster-nix/src/fs/inode_handle/dyn_cap.rs b/kernel/aster-nix/src/fs/inode_handle/dyn_cap.rs similarity index 100% rename from services/aster-nix/src/fs/inode_handle/dyn_cap.rs rename to kernel/aster-nix/src/fs/inode_handle/dyn_cap.rs diff --git a/services/aster-nix/src/fs/inode_handle/mod.rs b/kernel/aster-nix/src/fs/inode_handle/mod.rs similarity index 100% rename from services/aster-nix/src/fs/inode_handle/mod.rs rename to kernel/aster-nix/src/fs/inode_handle/mod.rs diff --git a/services/aster-nix/src/fs/inode_handle/static_cap.rs b/kernel/aster-nix/src/fs/inode_handle/static_cap.rs similarity index 100% rename from services/aster-nix/src/fs/inode_handle/static_cap.rs rename to kernel/aster-nix/src/fs/inode_handle/static_cap.rs diff --git a/services/aster-nix/src/fs/mod.rs b/kernel/aster-nix/src/fs/mod.rs similarity index 100% rename from services/aster-nix/src/fs/mod.rs rename to kernel/aster-nix/src/fs/mod.rs diff --git a/services/aster-nix/src/fs/pipe.rs b/kernel/aster-nix/src/fs/pipe.rs similarity index 100% rename from services/aster-nix/src/fs/pipe.rs rename to kernel/aster-nix/src/fs/pipe.rs diff --git a/services/aster-nix/src/fs/procfs/mod.rs b/kernel/aster-nix/src/fs/procfs/mod.rs similarity index 100% rename from services/aster-nix/src/fs/procfs/mod.rs rename to kernel/aster-nix/src/fs/procfs/mod.rs diff --git a/services/aster-nix/src/fs/procfs/pid/comm.rs b/kernel/aster-nix/src/fs/procfs/pid/comm.rs similarity index 100% rename from services/aster-nix/src/fs/procfs/pid/comm.rs rename to kernel/aster-nix/src/fs/procfs/pid/comm.rs diff --git a/services/aster-nix/src/fs/procfs/pid/exe.rs b/kernel/aster-nix/src/fs/procfs/pid/exe.rs similarity index 100% rename from services/aster-nix/src/fs/procfs/pid/exe.rs rename to kernel/aster-nix/src/fs/procfs/pid/exe.rs diff --git a/services/aster-nix/src/fs/procfs/pid/fd.rs b/kernel/aster-nix/src/fs/procfs/pid/fd.rs similarity index 100% rename from services/aster-nix/src/fs/procfs/pid/fd.rs rename to kernel/aster-nix/src/fs/procfs/pid/fd.rs diff --git a/services/aster-nix/src/fs/procfs/pid/mod.rs b/kernel/aster-nix/src/fs/procfs/pid/mod.rs similarity index 100% rename from services/aster-nix/src/fs/procfs/pid/mod.rs rename to kernel/aster-nix/src/fs/procfs/pid/mod.rs diff --git a/services/aster-nix/src/fs/procfs/self_.rs b/kernel/aster-nix/src/fs/procfs/self_.rs similarity index 100% rename from services/aster-nix/src/fs/procfs/self_.rs rename to kernel/aster-nix/src/fs/procfs/self_.rs diff --git a/services/aster-nix/src/fs/procfs/template/builder.rs b/kernel/aster-nix/src/fs/procfs/template/builder.rs similarity index 100% rename from services/aster-nix/src/fs/procfs/template/builder.rs rename to kernel/aster-nix/src/fs/procfs/template/builder.rs diff --git a/services/aster-nix/src/fs/procfs/template/dir.rs b/kernel/aster-nix/src/fs/procfs/template/dir.rs similarity index 100% rename from services/aster-nix/src/fs/procfs/template/dir.rs rename to kernel/aster-nix/src/fs/procfs/template/dir.rs diff --git a/services/aster-nix/src/fs/procfs/template/file.rs b/kernel/aster-nix/src/fs/procfs/template/file.rs similarity index 100% rename from services/aster-nix/src/fs/procfs/template/file.rs rename to kernel/aster-nix/src/fs/procfs/template/file.rs diff --git a/services/aster-nix/src/fs/procfs/template/mod.rs b/kernel/aster-nix/src/fs/procfs/template/mod.rs similarity index 100% rename from services/aster-nix/src/fs/procfs/template/mod.rs rename to kernel/aster-nix/src/fs/procfs/template/mod.rs diff --git a/services/aster-nix/src/fs/procfs/template/sym.rs b/kernel/aster-nix/src/fs/procfs/template/sym.rs similarity index 100% rename from services/aster-nix/src/fs/procfs/template/sym.rs rename to kernel/aster-nix/src/fs/procfs/template/sym.rs diff --git a/services/aster-nix/src/fs/ramfs/fs.rs b/kernel/aster-nix/src/fs/ramfs/fs.rs similarity index 100% rename from services/aster-nix/src/fs/ramfs/fs.rs rename to kernel/aster-nix/src/fs/ramfs/fs.rs diff --git a/services/aster-nix/src/fs/ramfs/mod.rs b/kernel/aster-nix/src/fs/ramfs/mod.rs similarity index 100% rename from services/aster-nix/src/fs/ramfs/mod.rs rename to kernel/aster-nix/src/fs/ramfs/mod.rs diff --git a/services/aster-nix/src/fs/rootfs.rs b/kernel/aster-nix/src/fs/rootfs.rs similarity index 100% rename from services/aster-nix/src/fs/rootfs.rs rename to kernel/aster-nix/src/fs/rootfs.rs diff --git a/services/aster-nix/src/fs/utils/access_mode.rs b/kernel/aster-nix/src/fs/utils/access_mode.rs similarity index 100% rename from services/aster-nix/src/fs/utils/access_mode.rs rename to kernel/aster-nix/src/fs/utils/access_mode.rs diff --git a/services/aster-nix/src/fs/utils/channel.rs b/kernel/aster-nix/src/fs/utils/channel.rs similarity index 100% rename from services/aster-nix/src/fs/utils/channel.rs rename to kernel/aster-nix/src/fs/utils/channel.rs diff --git a/services/aster-nix/src/fs/utils/creation_flags.rs b/kernel/aster-nix/src/fs/utils/creation_flags.rs similarity index 100% rename from services/aster-nix/src/fs/utils/creation_flags.rs rename to kernel/aster-nix/src/fs/utils/creation_flags.rs diff --git a/services/aster-nix/src/fs/utils/dentry.rs b/kernel/aster-nix/src/fs/utils/dentry.rs similarity index 100% rename from services/aster-nix/src/fs/utils/dentry.rs rename to kernel/aster-nix/src/fs/utils/dentry.rs diff --git a/services/aster-nix/src/fs/utils/dirent_visitor.rs b/kernel/aster-nix/src/fs/utils/dirent_visitor.rs similarity index 100% rename from services/aster-nix/src/fs/utils/dirent_visitor.rs rename to kernel/aster-nix/src/fs/utils/dirent_visitor.rs diff --git a/services/aster-nix/src/fs/utils/direntry_vec.rs b/kernel/aster-nix/src/fs/utils/direntry_vec.rs similarity index 100% rename from services/aster-nix/src/fs/utils/direntry_vec.rs rename to kernel/aster-nix/src/fs/utils/direntry_vec.rs diff --git a/services/aster-nix/src/fs/utils/file_creation_mask.rs b/kernel/aster-nix/src/fs/utils/file_creation_mask.rs similarity index 100% rename from services/aster-nix/src/fs/utils/file_creation_mask.rs rename to kernel/aster-nix/src/fs/utils/file_creation_mask.rs diff --git a/services/aster-nix/src/fs/utils/fs.rs b/kernel/aster-nix/src/fs/utils/fs.rs similarity index 100% rename from services/aster-nix/src/fs/utils/fs.rs rename to kernel/aster-nix/src/fs/utils/fs.rs diff --git a/services/aster-nix/src/fs/utils/inode.rs b/kernel/aster-nix/src/fs/utils/inode.rs similarity index 100% rename from services/aster-nix/src/fs/utils/inode.rs rename to kernel/aster-nix/src/fs/utils/inode.rs diff --git a/services/aster-nix/src/fs/utils/ioctl.rs b/kernel/aster-nix/src/fs/utils/ioctl.rs similarity index 100% rename from services/aster-nix/src/fs/utils/ioctl.rs rename to kernel/aster-nix/src/fs/utils/ioctl.rs diff --git a/services/aster-nix/src/fs/utils/mod.rs b/kernel/aster-nix/src/fs/utils/mod.rs similarity index 100% rename from services/aster-nix/src/fs/utils/mod.rs rename to kernel/aster-nix/src/fs/utils/mod.rs diff --git a/services/aster-nix/src/fs/utils/mount.rs b/kernel/aster-nix/src/fs/utils/mount.rs similarity index 100% rename from services/aster-nix/src/fs/utils/mount.rs rename to kernel/aster-nix/src/fs/utils/mount.rs diff --git a/services/aster-nix/src/fs/utils/page_cache.rs b/kernel/aster-nix/src/fs/utils/page_cache.rs similarity index 100% rename from services/aster-nix/src/fs/utils/page_cache.rs rename to kernel/aster-nix/src/fs/utils/page_cache.rs diff --git a/services/aster-nix/src/fs/utils/status_flags.rs b/kernel/aster-nix/src/fs/utils/status_flags.rs similarity index 100% rename from services/aster-nix/src/fs/utils/status_flags.rs rename to kernel/aster-nix/src/fs/utils/status_flags.rs diff --git a/services/aster-nix/src/lib.rs b/kernel/aster-nix/src/lib.rs similarity index 100% rename from services/aster-nix/src/lib.rs rename to kernel/aster-nix/src/lib.rs diff --git a/services/aster-nix/src/net/iface/any_socket.rs b/kernel/aster-nix/src/net/iface/any_socket.rs similarity index 100% rename from services/aster-nix/src/net/iface/any_socket.rs rename to kernel/aster-nix/src/net/iface/any_socket.rs diff --git a/services/aster-nix/src/net/iface/common.rs b/kernel/aster-nix/src/net/iface/common.rs similarity index 100% rename from services/aster-nix/src/net/iface/common.rs rename to kernel/aster-nix/src/net/iface/common.rs diff --git a/services/aster-nix/src/net/iface/loopback.rs b/kernel/aster-nix/src/net/iface/loopback.rs similarity index 100% rename from services/aster-nix/src/net/iface/loopback.rs rename to kernel/aster-nix/src/net/iface/loopback.rs diff --git a/services/aster-nix/src/net/iface/mod.rs b/kernel/aster-nix/src/net/iface/mod.rs similarity index 100% rename from services/aster-nix/src/net/iface/mod.rs rename to kernel/aster-nix/src/net/iface/mod.rs diff --git a/services/aster-nix/src/net/iface/time.rs b/kernel/aster-nix/src/net/iface/time.rs similarity index 100% rename from services/aster-nix/src/net/iface/time.rs rename to kernel/aster-nix/src/net/iface/time.rs diff --git a/services/aster-nix/src/net/iface/util.rs b/kernel/aster-nix/src/net/iface/util.rs similarity index 100% rename from services/aster-nix/src/net/iface/util.rs rename to kernel/aster-nix/src/net/iface/util.rs diff --git a/services/aster-nix/src/net/iface/virtio.rs b/kernel/aster-nix/src/net/iface/virtio.rs similarity index 100% rename from services/aster-nix/src/net/iface/virtio.rs rename to kernel/aster-nix/src/net/iface/virtio.rs diff --git a/services/aster-nix/src/net/mod.rs b/kernel/aster-nix/src/net/mod.rs similarity index 100% rename from services/aster-nix/src/net/mod.rs rename to kernel/aster-nix/src/net/mod.rs diff --git a/services/aster-nix/src/net/socket/ip/always_some.rs b/kernel/aster-nix/src/net/socket/ip/always_some.rs similarity index 100% rename from services/aster-nix/src/net/socket/ip/always_some.rs rename to kernel/aster-nix/src/net/socket/ip/always_some.rs diff --git a/services/aster-nix/src/net/socket/ip/common.rs b/kernel/aster-nix/src/net/socket/ip/common.rs similarity index 100% rename from services/aster-nix/src/net/socket/ip/common.rs rename to kernel/aster-nix/src/net/socket/ip/common.rs diff --git a/services/aster-nix/src/net/socket/ip/datagram/bound.rs b/kernel/aster-nix/src/net/socket/ip/datagram/bound.rs similarity index 100% rename from services/aster-nix/src/net/socket/ip/datagram/bound.rs rename to kernel/aster-nix/src/net/socket/ip/datagram/bound.rs diff --git a/services/aster-nix/src/net/socket/ip/datagram/mod.rs b/kernel/aster-nix/src/net/socket/ip/datagram/mod.rs similarity index 100% rename from services/aster-nix/src/net/socket/ip/datagram/mod.rs rename to kernel/aster-nix/src/net/socket/ip/datagram/mod.rs diff --git a/services/aster-nix/src/net/socket/ip/datagram/unbound.rs b/kernel/aster-nix/src/net/socket/ip/datagram/unbound.rs similarity index 100% rename from services/aster-nix/src/net/socket/ip/datagram/unbound.rs rename to kernel/aster-nix/src/net/socket/ip/datagram/unbound.rs diff --git a/services/aster-nix/src/net/socket/ip/mod.rs b/kernel/aster-nix/src/net/socket/ip/mod.rs similarity index 100% rename from services/aster-nix/src/net/socket/ip/mod.rs rename to kernel/aster-nix/src/net/socket/ip/mod.rs diff --git a/services/aster-nix/src/net/socket/ip/stream/connected.rs b/kernel/aster-nix/src/net/socket/ip/stream/connected.rs similarity index 100% rename from services/aster-nix/src/net/socket/ip/stream/connected.rs rename to kernel/aster-nix/src/net/socket/ip/stream/connected.rs diff --git a/services/aster-nix/src/net/socket/ip/stream/connecting.rs b/kernel/aster-nix/src/net/socket/ip/stream/connecting.rs similarity index 100% rename from services/aster-nix/src/net/socket/ip/stream/connecting.rs rename to kernel/aster-nix/src/net/socket/ip/stream/connecting.rs diff --git a/services/aster-nix/src/net/socket/ip/stream/init.rs b/kernel/aster-nix/src/net/socket/ip/stream/init.rs similarity index 100% rename from services/aster-nix/src/net/socket/ip/stream/init.rs rename to kernel/aster-nix/src/net/socket/ip/stream/init.rs diff --git a/services/aster-nix/src/net/socket/ip/stream/listen.rs b/kernel/aster-nix/src/net/socket/ip/stream/listen.rs similarity index 100% rename from services/aster-nix/src/net/socket/ip/stream/listen.rs rename to kernel/aster-nix/src/net/socket/ip/stream/listen.rs diff --git a/services/aster-nix/src/net/socket/ip/stream/mod.rs b/kernel/aster-nix/src/net/socket/ip/stream/mod.rs similarity index 100% rename from services/aster-nix/src/net/socket/ip/stream/mod.rs rename to kernel/aster-nix/src/net/socket/ip/stream/mod.rs diff --git a/services/aster-nix/src/net/socket/ip/stream/options.rs b/kernel/aster-nix/src/net/socket/ip/stream/options.rs similarity index 100% rename from services/aster-nix/src/net/socket/ip/stream/options.rs rename to kernel/aster-nix/src/net/socket/ip/stream/options.rs diff --git a/services/aster-nix/src/net/socket/ip/stream/util.rs b/kernel/aster-nix/src/net/socket/ip/stream/util.rs similarity index 100% rename from services/aster-nix/src/net/socket/ip/stream/util.rs rename to kernel/aster-nix/src/net/socket/ip/stream/util.rs diff --git a/services/aster-nix/src/net/socket/mod.rs b/kernel/aster-nix/src/net/socket/mod.rs similarity index 100% rename from services/aster-nix/src/net/socket/mod.rs rename to kernel/aster-nix/src/net/socket/mod.rs diff --git a/services/aster-nix/src/net/socket/options/macros.rs b/kernel/aster-nix/src/net/socket/options/macros.rs similarity index 100% rename from services/aster-nix/src/net/socket/options/macros.rs rename to kernel/aster-nix/src/net/socket/options/macros.rs diff --git a/services/aster-nix/src/net/socket/options/mod.rs b/kernel/aster-nix/src/net/socket/options/mod.rs similarity index 100% rename from services/aster-nix/src/net/socket/options/mod.rs rename to kernel/aster-nix/src/net/socket/options/mod.rs diff --git a/services/aster-nix/src/net/socket/unix/addr.rs b/kernel/aster-nix/src/net/socket/unix/addr.rs similarity index 100% rename from services/aster-nix/src/net/socket/unix/addr.rs rename to kernel/aster-nix/src/net/socket/unix/addr.rs diff --git a/services/aster-nix/src/net/socket/unix/mod.rs b/kernel/aster-nix/src/net/socket/unix/mod.rs similarity index 100% rename from services/aster-nix/src/net/socket/unix/mod.rs rename to kernel/aster-nix/src/net/socket/unix/mod.rs diff --git a/services/aster-nix/src/net/socket/unix/stream/connected.rs b/kernel/aster-nix/src/net/socket/unix/stream/connected.rs similarity index 100% rename from services/aster-nix/src/net/socket/unix/stream/connected.rs rename to kernel/aster-nix/src/net/socket/unix/stream/connected.rs diff --git a/services/aster-nix/src/net/socket/unix/stream/endpoint.rs b/kernel/aster-nix/src/net/socket/unix/stream/endpoint.rs similarity index 100% rename from services/aster-nix/src/net/socket/unix/stream/endpoint.rs rename to kernel/aster-nix/src/net/socket/unix/stream/endpoint.rs diff --git a/services/aster-nix/src/net/socket/unix/stream/init.rs b/kernel/aster-nix/src/net/socket/unix/stream/init.rs similarity index 100% rename from services/aster-nix/src/net/socket/unix/stream/init.rs rename to kernel/aster-nix/src/net/socket/unix/stream/init.rs diff --git a/services/aster-nix/src/net/socket/unix/stream/listener.rs b/kernel/aster-nix/src/net/socket/unix/stream/listener.rs similarity index 100% rename from services/aster-nix/src/net/socket/unix/stream/listener.rs rename to kernel/aster-nix/src/net/socket/unix/stream/listener.rs diff --git a/services/aster-nix/src/net/socket/unix/stream/mod.rs b/kernel/aster-nix/src/net/socket/unix/stream/mod.rs similarity index 100% rename from services/aster-nix/src/net/socket/unix/stream/mod.rs rename to kernel/aster-nix/src/net/socket/unix/stream/mod.rs diff --git a/services/aster-nix/src/net/socket/unix/stream/socket.rs b/kernel/aster-nix/src/net/socket/unix/stream/socket.rs similarity index 100% rename from services/aster-nix/src/net/socket/unix/stream/socket.rs rename to kernel/aster-nix/src/net/socket/unix/stream/socket.rs diff --git a/services/aster-nix/src/net/socket/util/mod.rs b/kernel/aster-nix/src/net/socket/util/mod.rs similarity index 100% rename from services/aster-nix/src/net/socket/util/mod.rs rename to kernel/aster-nix/src/net/socket/util/mod.rs diff --git a/services/aster-nix/src/net/socket/util/options.rs b/kernel/aster-nix/src/net/socket/util/options.rs similarity index 100% rename from services/aster-nix/src/net/socket/util/options.rs rename to kernel/aster-nix/src/net/socket/util/options.rs diff --git a/services/aster-nix/src/net/socket/util/send_recv_flags.rs b/kernel/aster-nix/src/net/socket/util/send_recv_flags.rs similarity index 100% rename from services/aster-nix/src/net/socket/util/send_recv_flags.rs rename to kernel/aster-nix/src/net/socket/util/send_recv_flags.rs diff --git a/services/aster-nix/src/net/socket/util/shutdown_cmd.rs b/kernel/aster-nix/src/net/socket/util/shutdown_cmd.rs similarity index 100% rename from services/aster-nix/src/net/socket/util/shutdown_cmd.rs rename to kernel/aster-nix/src/net/socket/util/shutdown_cmd.rs diff --git a/services/aster-nix/src/net/socket/util/socket_addr.rs b/kernel/aster-nix/src/net/socket/util/socket_addr.rs similarity index 100% rename from services/aster-nix/src/net/socket/util/socket_addr.rs rename to kernel/aster-nix/src/net/socket/util/socket_addr.rs diff --git a/services/aster-nix/src/prelude.rs b/kernel/aster-nix/src/prelude.rs similarity index 100% rename from services/aster-nix/src/prelude.rs rename to kernel/aster-nix/src/prelude.rs diff --git a/services/aster-nix/src/process/clone.rs b/kernel/aster-nix/src/process/clone.rs similarity index 100% rename from services/aster-nix/src/process/clone.rs rename to kernel/aster-nix/src/process/clone.rs diff --git a/services/aster-nix/src/process/credentials/credentials_.rs b/kernel/aster-nix/src/process/credentials/credentials_.rs similarity index 100% rename from services/aster-nix/src/process/credentials/credentials_.rs rename to kernel/aster-nix/src/process/credentials/credentials_.rs diff --git a/services/aster-nix/src/process/credentials/group.rs b/kernel/aster-nix/src/process/credentials/group.rs similarity index 100% rename from services/aster-nix/src/process/credentials/group.rs rename to kernel/aster-nix/src/process/credentials/group.rs diff --git a/services/aster-nix/src/process/credentials/mod.rs b/kernel/aster-nix/src/process/credentials/mod.rs similarity index 100% rename from services/aster-nix/src/process/credentials/mod.rs rename to kernel/aster-nix/src/process/credentials/mod.rs diff --git a/services/aster-nix/src/process/credentials/static_cap.rs b/kernel/aster-nix/src/process/credentials/static_cap.rs similarity index 100% rename from services/aster-nix/src/process/credentials/static_cap.rs rename to kernel/aster-nix/src/process/credentials/static_cap.rs diff --git a/services/aster-nix/src/process/credentials/user.rs b/kernel/aster-nix/src/process/credentials/user.rs similarity index 100% rename from services/aster-nix/src/process/credentials/user.rs rename to kernel/aster-nix/src/process/credentials/user.rs diff --git a/services/aster-nix/src/process/exit.rs b/kernel/aster-nix/src/process/exit.rs similarity index 100% rename from services/aster-nix/src/process/exit.rs rename to kernel/aster-nix/src/process/exit.rs diff --git a/services/aster-nix/src/process/kill.rs b/kernel/aster-nix/src/process/kill.rs similarity index 100% rename from services/aster-nix/src/process/kill.rs rename to kernel/aster-nix/src/process/kill.rs diff --git a/services/aster-nix/src/process/mod.rs b/kernel/aster-nix/src/process/mod.rs similarity index 100% rename from services/aster-nix/src/process/mod.rs rename to kernel/aster-nix/src/process/mod.rs diff --git a/services/aster-nix/src/process/posix_thread/builder.rs b/kernel/aster-nix/src/process/posix_thread/builder.rs similarity index 100% rename from services/aster-nix/src/process/posix_thread/builder.rs rename to kernel/aster-nix/src/process/posix_thread/builder.rs diff --git a/services/aster-nix/src/process/posix_thread/futex.rs b/kernel/aster-nix/src/process/posix_thread/futex.rs similarity index 100% rename from services/aster-nix/src/process/posix_thread/futex.rs rename to kernel/aster-nix/src/process/posix_thread/futex.rs diff --git a/services/aster-nix/src/process/posix_thread/mod.rs b/kernel/aster-nix/src/process/posix_thread/mod.rs similarity index 100% rename from services/aster-nix/src/process/posix_thread/mod.rs rename to kernel/aster-nix/src/process/posix_thread/mod.rs diff --git a/services/aster-nix/src/process/posix_thread/name.rs b/kernel/aster-nix/src/process/posix_thread/name.rs similarity index 100% rename from services/aster-nix/src/process/posix_thread/name.rs rename to kernel/aster-nix/src/process/posix_thread/name.rs diff --git a/services/aster-nix/src/process/posix_thread/posix_thread_ext.rs b/kernel/aster-nix/src/process/posix_thread/posix_thread_ext.rs similarity index 100% rename from services/aster-nix/src/process/posix_thread/posix_thread_ext.rs rename to kernel/aster-nix/src/process/posix_thread/posix_thread_ext.rs diff --git a/services/aster-nix/src/process/posix_thread/robust_list.rs b/kernel/aster-nix/src/process/posix_thread/robust_list.rs similarity index 100% rename from services/aster-nix/src/process/posix_thread/robust_list.rs rename to kernel/aster-nix/src/process/posix_thread/robust_list.rs diff --git a/services/aster-nix/src/process/process/builder.rs b/kernel/aster-nix/src/process/process/builder.rs similarity index 100% rename from services/aster-nix/src/process/process/builder.rs rename to kernel/aster-nix/src/process/process/builder.rs diff --git a/services/aster-nix/src/process/process/job_control.rs b/kernel/aster-nix/src/process/process/job_control.rs similarity index 100% rename from services/aster-nix/src/process/process/job_control.rs rename to kernel/aster-nix/src/process/process/job_control.rs diff --git a/services/aster-nix/src/process/process/mod.rs b/kernel/aster-nix/src/process/process/mod.rs similarity index 100% rename from services/aster-nix/src/process/process/mod.rs rename to kernel/aster-nix/src/process/process/mod.rs diff --git a/services/aster-nix/src/process/process/process_group.rs b/kernel/aster-nix/src/process/process/process_group.rs similarity index 100% rename from services/aster-nix/src/process/process/process_group.rs rename to kernel/aster-nix/src/process/process/process_group.rs diff --git a/services/aster-nix/src/process/process/session.rs b/kernel/aster-nix/src/process/process/session.rs similarity index 100% rename from services/aster-nix/src/process/process/session.rs rename to kernel/aster-nix/src/process/process/session.rs diff --git a/services/aster-nix/src/process/process/terminal.rs b/kernel/aster-nix/src/process/process/terminal.rs similarity index 100% rename from services/aster-nix/src/process/process/terminal.rs rename to kernel/aster-nix/src/process/process/terminal.rs diff --git a/services/aster-nix/src/process/process_filter.rs b/kernel/aster-nix/src/process/process_filter.rs similarity index 100% rename from services/aster-nix/src/process/process_filter.rs rename to kernel/aster-nix/src/process/process_filter.rs diff --git a/services/aster-nix/src/process/process_table.rs b/kernel/aster-nix/src/process/process_table.rs similarity index 100% rename from services/aster-nix/src/process/process_table.rs rename to kernel/aster-nix/src/process/process_table.rs diff --git a/services/aster-nix/src/process/process_vm/mod.rs b/kernel/aster-nix/src/process/process_vm/mod.rs similarity index 100% rename from services/aster-nix/src/process/process_vm/mod.rs rename to kernel/aster-nix/src/process/process_vm/mod.rs diff --git a/services/aster-nix/src/process/process_vm/user_heap.rs b/kernel/aster-nix/src/process/process_vm/user_heap.rs similarity index 100% rename from services/aster-nix/src/process/process_vm/user_heap.rs rename to kernel/aster-nix/src/process/process_vm/user_heap.rs diff --git a/services/aster-nix/src/process/program_loader/elf/aux_vec.rs b/kernel/aster-nix/src/process/program_loader/elf/aux_vec.rs similarity index 100% rename from services/aster-nix/src/process/program_loader/elf/aux_vec.rs rename to kernel/aster-nix/src/process/program_loader/elf/aux_vec.rs diff --git a/services/aster-nix/src/process/program_loader/elf/elf_file.rs b/kernel/aster-nix/src/process/program_loader/elf/elf_file.rs similarity index 100% rename from services/aster-nix/src/process/program_loader/elf/elf_file.rs rename to kernel/aster-nix/src/process/program_loader/elf/elf_file.rs diff --git a/services/aster-nix/src/process/program_loader/elf/init_stack.rs b/kernel/aster-nix/src/process/program_loader/elf/init_stack.rs similarity index 100% rename from services/aster-nix/src/process/program_loader/elf/init_stack.rs rename to kernel/aster-nix/src/process/program_loader/elf/init_stack.rs diff --git a/services/aster-nix/src/process/program_loader/elf/load_elf.rs b/kernel/aster-nix/src/process/program_loader/elf/load_elf.rs similarity index 100% rename from services/aster-nix/src/process/program_loader/elf/load_elf.rs rename to kernel/aster-nix/src/process/program_loader/elf/load_elf.rs diff --git a/services/aster-nix/src/process/program_loader/elf/mod.rs b/kernel/aster-nix/src/process/program_loader/elf/mod.rs similarity index 100% rename from services/aster-nix/src/process/program_loader/elf/mod.rs rename to kernel/aster-nix/src/process/program_loader/elf/mod.rs diff --git a/services/aster-nix/src/process/program_loader/mod.rs b/kernel/aster-nix/src/process/program_loader/mod.rs similarity index 100% rename from services/aster-nix/src/process/program_loader/mod.rs rename to kernel/aster-nix/src/process/program_loader/mod.rs diff --git a/services/aster-nix/src/process/program_loader/shebang.rs b/kernel/aster-nix/src/process/program_loader/shebang.rs similarity index 100% rename from services/aster-nix/src/process/program_loader/shebang.rs rename to kernel/aster-nix/src/process/program_loader/shebang.rs diff --git a/services/aster-nix/src/process/rlimit.rs b/kernel/aster-nix/src/process/rlimit.rs similarity index 100% rename from services/aster-nix/src/process/rlimit.rs rename to kernel/aster-nix/src/process/rlimit.rs diff --git a/services/aster-nix/src/process/signal/c_types.rs b/kernel/aster-nix/src/process/signal/c_types.rs similarity index 100% rename from services/aster-nix/src/process/signal/c_types.rs rename to kernel/aster-nix/src/process/signal/c_types.rs diff --git a/services/aster-nix/src/process/signal/constants.rs b/kernel/aster-nix/src/process/signal/constants.rs similarity index 100% rename from services/aster-nix/src/process/signal/constants.rs rename to kernel/aster-nix/src/process/signal/constants.rs diff --git a/services/aster-nix/src/process/signal/events.rs b/kernel/aster-nix/src/process/signal/events.rs similarity index 100% rename from services/aster-nix/src/process/signal/events.rs rename to kernel/aster-nix/src/process/signal/events.rs diff --git a/services/aster-nix/src/process/signal/mod.rs b/kernel/aster-nix/src/process/signal/mod.rs similarity index 100% rename from services/aster-nix/src/process/signal/mod.rs rename to kernel/aster-nix/src/process/signal/mod.rs diff --git a/services/aster-nix/src/process/signal/pauser.rs b/kernel/aster-nix/src/process/signal/pauser.rs similarity index 100% rename from services/aster-nix/src/process/signal/pauser.rs rename to kernel/aster-nix/src/process/signal/pauser.rs diff --git a/services/aster-nix/src/process/signal/poll.rs b/kernel/aster-nix/src/process/signal/poll.rs similarity index 100% rename from services/aster-nix/src/process/signal/poll.rs rename to kernel/aster-nix/src/process/signal/poll.rs diff --git a/services/aster-nix/src/process/signal/sig_action.rs b/kernel/aster-nix/src/process/signal/sig_action.rs similarity index 100% rename from services/aster-nix/src/process/signal/sig_action.rs rename to kernel/aster-nix/src/process/signal/sig_action.rs diff --git a/services/aster-nix/src/process/signal/sig_disposition.rs b/kernel/aster-nix/src/process/signal/sig_disposition.rs similarity index 100% rename from services/aster-nix/src/process/signal/sig_disposition.rs rename to kernel/aster-nix/src/process/signal/sig_disposition.rs diff --git a/services/aster-nix/src/process/signal/sig_mask.rs b/kernel/aster-nix/src/process/signal/sig_mask.rs similarity index 100% rename from services/aster-nix/src/process/signal/sig_mask.rs rename to kernel/aster-nix/src/process/signal/sig_mask.rs diff --git a/services/aster-nix/src/process/signal/sig_num.rs b/kernel/aster-nix/src/process/signal/sig_num.rs similarity index 100% rename from services/aster-nix/src/process/signal/sig_num.rs rename to kernel/aster-nix/src/process/signal/sig_num.rs diff --git a/services/aster-nix/src/process/signal/sig_queues.rs b/kernel/aster-nix/src/process/signal/sig_queues.rs similarity index 100% rename from services/aster-nix/src/process/signal/sig_queues.rs rename to kernel/aster-nix/src/process/signal/sig_queues.rs diff --git a/services/aster-nix/src/process/signal/sig_stack.rs b/kernel/aster-nix/src/process/signal/sig_stack.rs similarity index 100% rename from services/aster-nix/src/process/signal/sig_stack.rs rename to kernel/aster-nix/src/process/signal/sig_stack.rs diff --git a/services/aster-nix/src/process/signal/signals/fault.rs b/kernel/aster-nix/src/process/signal/signals/fault.rs similarity index 100% rename from services/aster-nix/src/process/signal/signals/fault.rs rename to kernel/aster-nix/src/process/signal/signals/fault.rs diff --git a/services/aster-nix/src/process/signal/signals/kernel.rs b/kernel/aster-nix/src/process/signal/signals/kernel.rs similarity index 100% rename from services/aster-nix/src/process/signal/signals/kernel.rs rename to kernel/aster-nix/src/process/signal/signals/kernel.rs diff --git a/services/aster-nix/src/process/signal/signals/mod.rs b/kernel/aster-nix/src/process/signal/signals/mod.rs similarity index 100% rename from services/aster-nix/src/process/signal/signals/mod.rs rename to kernel/aster-nix/src/process/signal/signals/mod.rs diff --git a/services/aster-nix/src/process/signal/signals/user.rs b/kernel/aster-nix/src/process/signal/signals/user.rs similarity index 100% rename from services/aster-nix/src/process/signal/signals/user.rs rename to kernel/aster-nix/src/process/signal/signals/user.rs diff --git a/services/aster-nix/src/process/status.rs b/kernel/aster-nix/src/process/status.rs similarity index 100% rename from services/aster-nix/src/process/status.rs rename to kernel/aster-nix/src/process/status.rs diff --git a/services/aster-nix/src/process/term_status.rs b/kernel/aster-nix/src/process/term_status.rs similarity index 100% rename from services/aster-nix/src/process/term_status.rs rename to kernel/aster-nix/src/process/term_status.rs diff --git a/services/aster-nix/src/process/wait.rs b/kernel/aster-nix/src/process/wait.rs similarity index 100% rename from services/aster-nix/src/process/wait.rs rename to kernel/aster-nix/src/process/wait.rs diff --git a/services/aster-nix/src/sched/mod.rs b/kernel/aster-nix/src/sched/mod.rs similarity index 100% rename from services/aster-nix/src/sched/mod.rs rename to kernel/aster-nix/src/sched/mod.rs diff --git a/services/aster-nix/src/sched/priority_scheduler.rs b/kernel/aster-nix/src/sched/priority_scheduler.rs similarity index 100% rename from services/aster-nix/src/sched/priority_scheduler.rs rename to kernel/aster-nix/src/sched/priority_scheduler.rs diff --git a/services/aster-nix/src/syscall/accept.rs b/kernel/aster-nix/src/syscall/accept.rs similarity index 100% rename from services/aster-nix/src/syscall/accept.rs rename to kernel/aster-nix/src/syscall/accept.rs diff --git a/services/aster-nix/src/syscall/access.rs b/kernel/aster-nix/src/syscall/access.rs similarity index 100% rename from services/aster-nix/src/syscall/access.rs rename to kernel/aster-nix/src/syscall/access.rs diff --git a/services/aster-nix/src/syscall/arch_prctl.rs b/kernel/aster-nix/src/syscall/arch_prctl.rs similarity index 100% rename from services/aster-nix/src/syscall/arch_prctl.rs rename to kernel/aster-nix/src/syscall/arch_prctl.rs diff --git a/services/aster-nix/src/syscall/bind.rs b/kernel/aster-nix/src/syscall/bind.rs similarity index 100% rename from services/aster-nix/src/syscall/bind.rs rename to kernel/aster-nix/src/syscall/bind.rs diff --git a/services/aster-nix/src/syscall/brk.rs b/kernel/aster-nix/src/syscall/brk.rs similarity index 100% rename from services/aster-nix/src/syscall/brk.rs rename to kernel/aster-nix/src/syscall/brk.rs diff --git a/services/aster-nix/src/syscall/chdir.rs b/kernel/aster-nix/src/syscall/chdir.rs similarity index 100% rename from services/aster-nix/src/syscall/chdir.rs rename to kernel/aster-nix/src/syscall/chdir.rs diff --git a/services/aster-nix/src/syscall/chmod.rs b/kernel/aster-nix/src/syscall/chmod.rs similarity index 100% rename from services/aster-nix/src/syscall/chmod.rs rename to kernel/aster-nix/src/syscall/chmod.rs diff --git a/services/aster-nix/src/syscall/chown.rs b/kernel/aster-nix/src/syscall/chown.rs similarity index 100% rename from services/aster-nix/src/syscall/chown.rs rename to kernel/aster-nix/src/syscall/chown.rs diff --git a/services/aster-nix/src/syscall/clock_gettime.rs b/kernel/aster-nix/src/syscall/clock_gettime.rs similarity index 100% rename from services/aster-nix/src/syscall/clock_gettime.rs rename to kernel/aster-nix/src/syscall/clock_gettime.rs diff --git a/services/aster-nix/src/syscall/clock_nanosleep.rs b/kernel/aster-nix/src/syscall/clock_nanosleep.rs similarity index 100% rename from services/aster-nix/src/syscall/clock_nanosleep.rs rename to kernel/aster-nix/src/syscall/clock_nanosleep.rs diff --git a/services/aster-nix/src/syscall/clone.rs b/kernel/aster-nix/src/syscall/clone.rs similarity index 100% rename from services/aster-nix/src/syscall/clone.rs rename to kernel/aster-nix/src/syscall/clone.rs diff --git a/services/aster-nix/src/syscall/close.rs b/kernel/aster-nix/src/syscall/close.rs similarity index 100% rename from services/aster-nix/src/syscall/close.rs rename to kernel/aster-nix/src/syscall/close.rs diff --git a/services/aster-nix/src/syscall/connect.rs b/kernel/aster-nix/src/syscall/connect.rs similarity index 100% rename from services/aster-nix/src/syscall/connect.rs rename to kernel/aster-nix/src/syscall/connect.rs diff --git a/services/aster-nix/src/syscall/constants.rs b/kernel/aster-nix/src/syscall/constants.rs similarity index 100% rename from services/aster-nix/src/syscall/constants.rs rename to kernel/aster-nix/src/syscall/constants.rs diff --git a/services/aster-nix/src/syscall/dup.rs b/kernel/aster-nix/src/syscall/dup.rs similarity index 100% rename from services/aster-nix/src/syscall/dup.rs rename to kernel/aster-nix/src/syscall/dup.rs diff --git a/services/aster-nix/src/syscall/epoll.rs b/kernel/aster-nix/src/syscall/epoll.rs similarity index 100% rename from services/aster-nix/src/syscall/epoll.rs rename to kernel/aster-nix/src/syscall/epoll.rs diff --git a/services/aster-nix/src/syscall/execve.rs b/kernel/aster-nix/src/syscall/execve.rs similarity index 100% rename from services/aster-nix/src/syscall/execve.rs rename to kernel/aster-nix/src/syscall/execve.rs diff --git a/services/aster-nix/src/syscall/exit.rs b/kernel/aster-nix/src/syscall/exit.rs similarity index 100% rename from services/aster-nix/src/syscall/exit.rs rename to kernel/aster-nix/src/syscall/exit.rs diff --git a/services/aster-nix/src/syscall/exit_group.rs b/kernel/aster-nix/src/syscall/exit_group.rs similarity index 100% rename from services/aster-nix/src/syscall/exit_group.rs rename to kernel/aster-nix/src/syscall/exit_group.rs diff --git a/services/aster-nix/src/syscall/fcntl.rs b/kernel/aster-nix/src/syscall/fcntl.rs similarity index 100% rename from services/aster-nix/src/syscall/fcntl.rs rename to kernel/aster-nix/src/syscall/fcntl.rs diff --git a/services/aster-nix/src/syscall/fork.rs b/kernel/aster-nix/src/syscall/fork.rs similarity index 100% rename from services/aster-nix/src/syscall/fork.rs rename to kernel/aster-nix/src/syscall/fork.rs diff --git a/services/aster-nix/src/syscall/fsync.rs b/kernel/aster-nix/src/syscall/fsync.rs similarity index 100% rename from services/aster-nix/src/syscall/fsync.rs rename to kernel/aster-nix/src/syscall/fsync.rs diff --git a/services/aster-nix/src/syscall/futex.rs b/kernel/aster-nix/src/syscall/futex.rs similarity index 100% rename from services/aster-nix/src/syscall/futex.rs rename to kernel/aster-nix/src/syscall/futex.rs diff --git a/services/aster-nix/src/syscall/getcwd.rs b/kernel/aster-nix/src/syscall/getcwd.rs similarity index 100% rename from services/aster-nix/src/syscall/getcwd.rs rename to kernel/aster-nix/src/syscall/getcwd.rs diff --git a/services/aster-nix/src/syscall/getdents64.rs b/kernel/aster-nix/src/syscall/getdents64.rs similarity index 100% rename from services/aster-nix/src/syscall/getdents64.rs rename to kernel/aster-nix/src/syscall/getdents64.rs diff --git a/services/aster-nix/src/syscall/getegid.rs b/kernel/aster-nix/src/syscall/getegid.rs similarity index 100% rename from services/aster-nix/src/syscall/getegid.rs rename to kernel/aster-nix/src/syscall/getegid.rs diff --git a/services/aster-nix/src/syscall/geteuid.rs b/kernel/aster-nix/src/syscall/geteuid.rs similarity index 100% rename from services/aster-nix/src/syscall/geteuid.rs rename to kernel/aster-nix/src/syscall/geteuid.rs diff --git a/services/aster-nix/src/syscall/getgid.rs b/kernel/aster-nix/src/syscall/getgid.rs similarity index 100% rename from services/aster-nix/src/syscall/getgid.rs rename to kernel/aster-nix/src/syscall/getgid.rs diff --git a/services/aster-nix/src/syscall/getgroups.rs b/kernel/aster-nix/src/syscall/getgroups.rs similarity index 100% rename from services/aster-nix/src/syscall/getgroups.rs rename to kernel/aster-nix/src/syscall/getgroups.rs diff --git a/services/aster-nix/src/syscall/getpeername.rs b/kernel/aster-nix/src/syscall/getpeername.rs similarity index 100% rename from services/aster-nix/src/syscall/getpeername.rs rename to kernel/aster-nix/src/syscall/getpeername.rs diff --git a/services/aster-nix/src/syscall/getpgrp.rs b/kernel/aster-nix/src/syscall/getpgrp.rs similarity index 100% rename from services/aster-nix/src/syscall/getpgrp.rs rename to kernel/aster-nix/src/syscall/getpgrp.rs diff --git a/services/aster-nix/src/syscall/getpid.rs b/kernel/aster-nix/src/syscall/getpid.rs similarity index 100% rename from services/aster-nix/src/syscall/getpid.rs rename to kernel/aster-nix/src/syscall/getpid.rs diff --git a/services/aster-nix/src/syscall/getppid.rs b/kernel/aster-nix/src/syscall/getppid.rs similarity index 100% rename from services/aster-nix/src/syscall/getppid.rs rename to kernel/aster-nix/src/syscall/getppid.rs diff --git a/services/aster-nix/src/syscall/getrandom.rs b/kernel/aster-nix/src/syscall/getrandom.rs similarity index 100% rename from services/aster-nix/src/syscall/getrandom.rs rename to kernel/aster-nix/src/syscall/getrandom.rs diff --git a/services/aster-nix/src/syscall/getresgid.rs b/kernel/aster-nix/src/syscall/getresgid.rs similarity index 100% rename from services/aster-nix/src/syscall/getresgid.rs rename to kernel/aster-nix/src/syscall/getresgid.rs diff --git a/services/aster-nix/src/syscall/getresuid.rs b/kernel/aster-nix/src/syscall/getresuid.rs similarity index 100% rename from services/aster-nix/src/syscall/getresuid.rs rename to kernel/aster-nix/src/syscall/getresuid.rs diff --git a/services/aster-nix/src/syscall/getsid.rs b/kernel/aster-nix/src/syscall/getsid.rs similarity index 100% rename from services/aster-nix/src/syscall/getsid.rs rename to kernel/aster-nix/src/syscall/getsid.rs diff --git a/services/aster-nix/src/syscall/getsockname.rs b/kernel/aster-nix/src/syscall/getsockname.rs similarity index 100% rename from services/aster-nix/src/syscall/getsockname.rs rename to kernel/aster-nix/src/syscall/getsockname.rs diff --git a/services/aster-nix/src/syscall/getsockopt.rs b/kernel/aster-nix/src/syscall/getsockopt.rs similarity index 100% rename from services/aster-nix/src/syscall/getsockopt.rs rename to kernel/aster-nix/src/syscall/getsockopt.rs diff --git a/services/aster-nix/src/syscall/gettid.rs b/kernel/aster-nix/src/syscall/gettid.rs similarity index 100% rename from services/aster-nix/src/syscall/gettid.rs rename to kernel/aster-nix/src/syscall/gettid.rs diff --git a/services/aster-nix/src/syscall/gettimeofday.rs b/kernel/aster-nix/src/syscall/gettimeofday.rs similarity index 100% rename from services/aster-nix/src/syscall/gettimeofday.rs rename to kernel/aster-nix/src/syscall/gettimeofday.rs diff --git a/services/aster-nix/src/syscall/getuid.rs b/kernel/aster-nix/src/syscall/getuid.rs similarity index 100% rename from services/aster-nix/src/syscall/getuid.rs rename to kernel/aster-nix/src/syscall/getuid.rs diff --git a/services/aster-nix/src/syscall/ioctl.rs b/kernel/aster-nix/src/syscall/ioctl.rs similarity index 100% rename from services/aster-nix/src/syscall/ioctl.rs rename to kernel/aster-nix/src/syscall/ioctl.rs diff --git a/services/aster-nix/src/syscall/kill.rs b/kernel/aster-nix/src/syscall/kill.rs similarity index 100% rename from services/aster-nix/src/syscall/kill.rs rename to kernel/aster-nix/src/syscall/kill.rs diff --git a/services/aster-nix/src/syscall/link.rs b/kernel/aster-nix/src/syscall/link.rs similarity index 100% rename from services/aster-nix/src/syscall/link.rs rename to kernel/aster-nix/src/syscall/link.rs diff --git a/services/aster-nix/src/syscall/listen.rs b/kernel/aster-nix/src/syscall/listen.rs similarity index 100% rename from services/aster-nix/src/syscall/listen.rs rename to kernel/aster-nix/src/syscall/listen.rs diff --git a/services/aster-nix/src/syscall/lseek.rs b/kernel/aster-nix/src/syscall/lseek.rs similarity index 100% rename from services/aster-nix/src/syscall/lseek.rs rename to kernel/aster-nix/src/syscall/lseek.rs diff --git a/services/aster-nix/src/syscall/madvise.rs b/kernel/aster-nix/src/syscall/madvise.rs similarity index 100% rename from services/aster-nix/src/syscall/madvise.rs rename to kernel/aster-nix/src/syscall/madvise.rs diff --git a/services/aster-nix/src/syscall/mkdir.rs b/kernel/aster-nix/src/syscall/mkdir.rs similarity index 100% rename from services/aster-nix/src/syscall/mkdir.rs rename to kernel/aster-nix/src/syscall/mkdir.rs diff --git a/services/aster-nix/src/syscall/mmap.rs b/kernel/aster-nix/src/syscall/mmap.rs similarity index 100% rename from services/aster-nix/src/syscall/mmap.rs rename to kernel/aster-nix/src/syscall/mmap.rs diff --git a/services/aster-nix/src/syscall/mod.rs b/kernel/aster-nix/src/syscall/mod.rs similarity index 100% rename from services/aster-nix/src/syscall/mod.rs rename to kernel/aster-nix/src/syscall/mod.rs diff --git a/services/aster-nix/src/syscall/mprotect.rs b/kernel/aster-nix/src/syscall/mprotect.rs similarity index 100% rename from services/aster-nix/src/syscall/mprotect.rs rename to kernel/aster-nix/src/syscall/mprotect.rs diff --git a/services/aster-nix/src/syscall/munmap.rs b/kernel/aster-nix/src/syscall/munmap.rs similarity index 100% rename from services/aster-nix/src/syscall/munmap.rs rename to kernel/aster-nix/src/syscall/munmap.rs diff --git a/services/aster-nix/src/syscall/open.rs b/kernel/aster-nix/src/syscall/open.rs similarity index 100% rename from services/aster-nix/src/syscall/open.rs rename to kernel/aster-nix/src/syscall/open.rs diff --git a/services/aster-nix/src/syscall/pause.rs b/kernel/aster-nix/src/syscall/pause.rs similarity index 100% rename from services/aster-nix/src/syscall/pause.rs rename to kernel/aster-nix/src/syscall/pause.rs diff --git a/services/aster-nix/src/syscall/pipe.rs b/kernel/aster-nix/src/syscall/pipe.rs similarity index 100% rename from services/aster-nix/src/syscall/pipe.rs rename to kernel/aster-nix/src/syscall/pipe.rs diff --git a/services/aster-nix/src/syscall/poll.rs b/kernel/aster-nix/src/syscall/poll.rs similarity index 100% rename from services/aster-nix/src/syscall/poll.rs rename to kernel/aster-nix/src/syscall/poll.rs diff --git a/services/aster-nix/src/syscall/prctl.rs b/kernel/aster-nix/src/syscall/prctl.rs similarity index 100% rename from services/aster-nix/src/syscall/prctl.rs rename to kernel/aster-nix/src/syscall/prctl.rs diff --git a/services/aster-nix/src/syscall/pread64.rs b/kernel/aster-nix/src/syscall/pread64.rs similarity index 100% rename from services/aster-nix/src/syscall/pread64.rs rename to kernel/aster-nix/src/syscall/pread64.rs diff --git a/services/aster-nix/src/syscall/prlimit64.rs b/kernel/aster-nix/src/syscall/prlimit64.rs similarity index 100% rename from services/aster-nix/src/syscall/prlimit64.rs rename to kernel/aster-nix/src/syscall/prlimit64.rs diff --git a/services/aster-nix/src/syscall/read.rs b/kernel/aster-nix/src/syscall/read.rs similarity index 100% rename from services/aster-nix/src/syscall/read.rs rename to kernel/aster-nix/src/syscall/read.rs diff --git a/services/aster-nix/src/syscall/readlink.rs b/kernel/aster-nix/src/syscall/readlink.rs similarity index 100% rename from services/aster-nix/src/syscall/readlink.rs rename to kernel/aster-nix/src/syscall/readlink.rs diff --git a/services/aster-nix/src/syscall/recvfrom.rs b/kernel/aster-nix/src/syscall/recvfrom.rs similarity index 100% rename from services/aster-nix/src/syscall/recvfrom.rs rename to kernel/aster-nix/src/syscall/recvfrom.rs diff --git a/services/aster-nix/src/syscall/rename.rs b/kernel/aster-nix/src/syscall/rename.rs similarity index 100% rename from services/aster-nix/src/syscall/rename.rs rename to kernel/aster-nix/src/syscall/rename.rs diff --git a/services/aster-nix/src/syscall/rmdir.rs b/kernel/aster-nix/src/syscall/rmdir.rs similarity index 100% rename from services/aster-nix/src/syscall/rmdir.rs rename to kernel/aster-nix/src/syscall/rmdir.rs diff --git a/services/aster-nix/src/syscall/rt_sigaction.rs b/kernel/aster-nix/src/syscall/rt_sigaction.rs similarity index 100% rename from services/aster-nix/src/syscall/rt_sigaction.rs rename to kernel/aster-nix/src/syscall/rt_sigaction.rs diff --git a/services/aster-nix/src/syscall/rt_sigprocmask.rs b/kernel/aster-nix/src/syscall/rt_sigprocmask.rs similarity index 100% rename from services/aster-nix/src/syscall/rt_sigprocmask.rs rename to kernel/aster-nix/src/syscall/rt_sigprocmask.rs diff --git a/services/aster-nix/src/syscall/rt_sigreturn.rs b/kernel/aster-nix/src/syscall/rt_sigreturn.rs similarity index 100% rename from services/aster-nix/src/syscall/rt_sigreturn.rs rename to kernel/aster-nix/src/syscall/rt_sigreturn.rs diff --git a/services/aster-nix/src/syscall/sched_yield.rs b/kernel/aster-nix/src/syscall/sched_yield.rs similarity index 100% rename from services/aster-nix/src/syscall/sched_yield.rs rename to kernel/aster-nix/src/syscall/sched_yield.rs diff --git a/services/aster-nix/src/syscall/select.rs b/kernel/aster-nix/src/syscall/select.rs similarity index 100% rename from services/aster-nix/src/syscall/select.rs rename to kernel/aster-nix/src/syscall/select.rs diff --git a/services/aster-nix/src/syscall/sendto.rs b/kernel/aster-nix/src/syscall/sendto.rs similarity index 100% rename from services/aster-nix/src/syscall/sendto.rs rename to kernel/aster-nix/src/syscall/sendto.rs diff --git a/services/aster-nix/src/syscall/set_robust_list.rs b/kernel/aster-nix/src/syscall/set_robust_list.rs similarity index 100% rename from services/aster-nix/src/syscall/set_robust_list.rs rename to kernel/aster-nix/src/syscall/set_robust_list.rs diff --git a/services/aster-nix/src/syscall/set_tid_address.rs b/kernel/aster-nix/src/syscall/set_tid_address.rs similarity index 100% rename from services/aster-nix/src/syscall/set_tid_address.rs rename to kernel/aster-nix/src/syscall/set_tid_address.rs diff --git a/services/aster-nix/src/syscall/setfsgid.rs b/kernel/aster-nix/src/syscall/setfsgid.rs similarity index 100% rename from services/aster-nix/src/syscall/setfsgid.rs rename to kernel/aster-nix/src/syscall/setfsgid.rs diff --git a/services/aster-nix/src/syscall/setfsuid.rs b/kernel/aster-nix/src/syscall/setfsuid.rs similarity index 100% rename from services/aster-nix/src/syscall/setfsuid.rs rename to kernel/aster-nix/src/syscall/setfsuid.rs diff --git a/services/aster-nix/src/syscall/setgid.rs b/kernel/aster-nix/src/syscall/setgid.rs similarity index 100% rename from services/aster-nix/src/syscall/setgid.rs rename to kernel/aster-nix/src/syscall/setgid.rs diff --git a/services/aster-nix/src/syscall/setgroups.rs b/kernel/aster-nix/src/syscall/setgroups.rs similarity index 100% rename from services/aster-nix/src/syscall/setgroups.rs rename to kernel/aster-nix/src/syscall/setgroups.rs diff --git a/services/aster-nix/src/syscall/setpgid.rs b/kernel/aster-nix/src/syscall/setpgid.rs similarity index 100% rename from services/aster-nix/src/syscall/setpgid.rs rename to kernel/aster-nix/src/syscall/setpgid.rs diff --git a/services/aster-nix/src/syscall/setregid.rs b/kernel/aster-nix/src/syscall/setregid.rs similarity index 100% rename from services/aster-nix/src/syscall/setregid.rs rename to kernel/aster-nix/src/syscall/setregid.rs diff --git a/services/aster-nix/src/syscall/setresgid.rs b/kernel/aster-nix/src/syscall/setresgid.rs similarity index 100% rename from services/aster-nix/src/syscall/setresgid.rs rename to kernel/aster-nix/src/syscall/setresgid.rs diff --git a/services/aster-nix/src/syscall/setresuid.rs b/kernel/aster-nix/src/syscall/setresuid.rs similarity index 100% rename from services/aster-nix/src/syscall/setresuid.rs rename to kernel/aster-nix/src/syscall/setresuid.rs diff --git a/services/aster-nix/src/syscall/setreuid.rs b/kernel/aster-nix/src/syscall/setreuid.rs similarity index 100% rename from services/aster-nix/src/syscall/setreuid.rs rename to kernel/aster-nix/src/syscall/setreuid.rs diff --git a/services/aster-nix/src/syscall/setsid.rs b/kernel/aster-nix/src/syscall/setsid.rs similarity index 100% rename from services/aster-nix/src/syscall/setsid.rs rename to kernel/aster-nix/src/syscall/setsid.rs diff --git a/services/aster-nix/src/syscall/setsockopt.rs b/kernel/aster-nix/src/syscall/setsockopt.rs similarity index 100% rename from services/aster-nix/src/syscall/setsockopt.rs rename to kernel/aster-nix/src/syscall/setsockopt.rs diff --git a/services/aster-nix/src/syscall/setuid.rs b/kernel/aster-nix/src/syscall/setuid.rs similarity index 100% rename from services/aster-nix/src/syscall/setuid.rs rename to kernel/aster-nix/src/syscall/setuid.rs diff --git a/services/aster-nix/src/syscall/shutdown.rs b/kernel/aster-nix/src/syscall/shutdown.rs similarity index 100% rename from services/aster-nix/src/syscall/shutdown.rs rename to kernel/aster-nix/src/syscall/shutdown.rs diff --git a/services/aster-nix/src/syscall/sigaltstack.rs b/kernel/aster-nix/src/syscall/sigaltstack.rs similarity index 100% rename from services/aster-nix/src/syscall/sigaltstack.rs rename to kernel/aster-nix/src/syscall/sigaltstack.rs diff --git a/services/aster-nix/src/syscall/socket.rs b/kernel/aster-nix/src/syscall/socket.rs similarity index 100% rename from services/aster-nix/src/syscall/socket.rs rename to kernel/aster-nix/src/syscall/socket.rs diff --git a/services/aster-nix/src/syscall/socketpair.rs b/kernel/aster-nix/src/syscall/socketpair.rs similarity index 100% rename from services/aster-nix/src/syscall/socketpair.rs rename to kernel/aster-nix/src/syscall/socketpair.rs diff --git a/services/aster-nix/src/syscall/stat.rs b/kernel/aster-nix/src/syscall/stat.rs similarity index 100% rename from services/aster-nix/src/syscall/stat.rs rename to kernel/aster-nix/src/syscall/stat.rs diff --git a/services/aster-nix/src/syscall/statfs.rs b/kernel/aster-nix/src/syscall/statfs.rs similarity index 100% rename from services/aster-nix/src/syscall/statfs.rs rename to kernel/aster-nix/src/syscall/statfs.rs diff --git a/services/aster-nix/src/syscall/symlink.rs b/kernel/aster-nix/src/syscall/symlink.rs similarity index 100% rename from services/aster-nix/src/syscall/symlink.rs rename to kernel/aster-nix/src/syscall/symlink.rs diff --git a/services/aster-nix/src/syscall/sync.rs b/kernel/aster-nix/src/syscall/sync.rs similarity index 100% rename from services/aster-nix/src/syscall/sync.rs rename to kernel/aster-nix/src/syscall/sync.rs diff --git a/services/aster-nix/src/syscall/tgkill.rs b/kernel/aster-nix/src/syscall/tgkill.rs similarity index 100% rename from services/aster-nix/src/syscall/tgkill.rs rename to kernel/aster-nix/src/syscall/tgkill.rs diff --git a/services/aster-nix/src/syscall/time.rs b/kernel/aster-nix/src/syscall/time.rs similarity index 100% rename from services/aster-nix/src/syscall/time.rs rename to kernel/aster-nix/src/syscall/time.rs diff --git a/services/aster-nix/src/syscall/truncate.rs b/kernel/aster-nix/src/syscall/truncate.rs similarity index 100% rename from services/aster-nix/src/syscall/truncate.rs rename to kernel/aster-nix/src/syscall/truncate.rs diff --git a/services/aster-nix/src/syscall/umask.rs b/kernel/aster-nix/src/syscall/umask.rs similarity index 100% rename from services/aster-nix/src/syscall/umask.rs rename to kernel/aster-nix/src/syscall/umask.rs diff --git a/services/aster-nix/src/syscall/uname.rs b/kernel/aster-nix/src/syscall/uname.rs similarity index 100% rename from services/aster-nix/src/syscall/uname.rs rename to kernel/aster-nix/src/syscall/uname.rs diff --git a/services/aster-nix/src/syscall/unlink.rs b/kernel/aster-nix/src/syscall/unlink.rs similarity index 100% rename from services/aster-nix/src/syscall/unlink.rs rename to kernel/aster-nix/src/syscall/unlink.rs diff --git a/services/aster-nix/src/syscall/utimens.rs b/kernel/aster-nix/src/syscall/utimens.rs similarity index 100% rename from services/aster-nix/src/syscall/utimens.rs rename to kernel/aster-nix/src/syscall/utimens.rs diff --git a/services/aster-nix/src/syscall/wait4.rs b/kernel/aster-nix/src/syscall/wait4.rs similarity index 100% rename from services/aster-nix/src/syscall/wait4.rs rename to kernel/aster-nix/src/syscall/wait4.rs diff --git a/services/aster-nix/src/syscall/waitid.rs b/kernel/aster-nix/src/syscall/waitid.rs similarity index 100% rename from services/aster-nix/src/syscall/waitid.rs rename to kernel/aster-nix/src/syscall/waitid.rs diff --git a/services/aster-nix/src/syscall/write.rs b/kernel/aster-nix/src/syscall/write.rs similarity index 100% rename from services/aster-nix/src/syscall/write.rs rename to kernel/aster-nix/src/syscall/write.rs diff --git a/services/aster-nix/src/syscall/writev.rs b/kernel/aster-nix/src/syscall/writev.rs similarity index 100% rename from services/aster-nix/src/syscall/writev.rs rename to kernel/aster-nix/src/syscall/writev.rs diff --git a/services/aster-nix/src/thread/exception.rs b/kernel/aster-nix/src/thread/exception.rs similarity index 100% rename from services/aster-nix/src/thread/exception.rs rename to kernel/aster-nix/src/thread/exception.rs diff --git a/services/aster-nix/src/thread/kernel_thread.rs b/kernel/aster-nix/src/thread/kernel_thread.rs similarity index 100% rename from services/aster-nix/src/thread/kernel_thread.rs rename to kernel/aster-nix/src/thread/kernel_thread.rs diff --git a/services/aster-nix/src/thread/mod.rs b/kernel/aster-nix/src/thread/mod.rs similarity index 100% rename from services/aster-nix/src/thread/mod.rs rename to kernel/aster-nix/src/thread/mod.rs diff --git a/services/aster-nix/src/thread/status.rs b/kernel/aster-nix/src/thread/status.rs similarity index 100% rename from services/aster-nix/src/thread/status.rs rename to kernel/aster-nix/src/thread/status.rs diff --git a/services/aster-nix/src/thread/task.rs b/kernel/aster-nix/src/thread/task.rs similarity index 100% rename from services/aster-nix/src/thread/task.rs rename to kernel/aster-nix/src/thread/task.rs diff --git a/services/aster-nix/src/thread/thread_table.rs b/kernel/aster-nix/src/thread/thread_table.rs similarity index 100% rename from services/aster-nix/src/thread/thread_table.rs rename to kernel/aster-nix/src/thread/thread_table.rs diff --git a/services/aster-nix/src/thread/work_queue/mod.rs b/kernel/aster-nix/src/thread/work_queue/mod.rs similarity index 100% rename from services/aster-nix/src/thread/work_queue/mod.rs rename to kernel/aster-nix/src/thread/work_queue/mod.rs diff --git a/services/aster-nix/src/thread/work_queue/simple_scheduler.rs b/kernel/aster-nix/src/thread/work_queue/simple_scheduler.rs similarity index 100% rename from services/aster-nix/src/thread/work_queue/simple_scheduler.rs rename to kernel/aster-nix/src/thread/work_queue/simple_scheduler.rs diff --git a/services/aster-nix/src/thread/work_queue/work_item.rs b/kernel/aster-nix/src/thread/work_queue/work_item.rs similarity index 100% rename from services/aster-nix/src/thread/work_queue/work_item.rs rename to kernel/aster-nix/src/thread/work_queue/work_item.rs diff --git a/services/aster-nix/src/thread/work_queue/worker.rs b/kernel/aster-nix/src/thread/work_queue/worker.rs similarity index 100% rename from services/aster-nix/src/thread/work_queue/worker.rs rename to kernel/aster-nix/src/thread/work_queue/worker.rs diff --git a/services/aster-nix/src/thread/work_queue/worker_pool.rs b/kernel/aster-nix/src/thread/work_queue/worker_pool.rs similarity index 100% rename from services/aster-nix/src/thread/work_queue/worker_pool.rs rename to kernel/aster-nix/src/thread/work_queue/worker_pool.rs diff --git a/services/aster-nix/src/time/mod.rs b/kernel/aster-nix/src/time/mod.rs similarity index 100% rename from services/aster-nix/src/time/mod.rs rename to kernel/aster-nix/src/time/mod.rs diff --git a/services/aster-nix/src/time/system_time.rs b/kernel/aster-nix/src/time/system_time.rs similarity index 100% rename from services/aster-nix/src/time/system_time.rs rename to kernel/aster-nix/src/time/system_time.rs diff --git a/services/aster-nix/src/util/mod.rs b/kernel/aster-nix/src/util/mod.rs similarity index 100% rename from services/aster-nix/src/util/mod.rs rename to kernel/aster-nix/src/util/mod.rs diff --git a/services/aster-nix/src/util/net/addr.rs b/kernel/aster-nix/src/util/net/addr.rs similarity index 100% rename from services/aster-nix/src/util/net/addr.rs rename to kernel/aster-nix/src/util/net/addr.rs diff --git a/services/aster-nix/src/util/net/mod.rs b/kernel/aster-nix/src/util/net/mod.rs similarity index 100% rename from services/aster-nix/src/util/net/mod.rs rename to kernel/aster-nix/src/util/net/mod.rs diff --git a/services/aster-nix/src/util/net/options/mod.rs b/kernel/aster-nix/src/util/net/options/mod.rs similarity index 100% rename from services/aster-nix/src/util/net/options/mod.rs rename to kernel/aster-nix/src/util/net/options/mod.rs diff --git a/services/aster-nix/src/util/net/options/socket.rs b/kernel/aster-nix/src/util/net/options/socket.rs similarity index 100% rename from services/aster-nix/src/util/net/options/socket.rs rename to kernel/aster-nix/src/util/net/options/socket.rs diff --git a/services/aster-nix/src/util/net/options/tcp.rs b/kernel/aster-nix/src/util/net/options/tcp.rs similarity index 100% rename from services/aster-nix/src/util/net/options/tcp.rs rename to kernel/aster-nix/src/util/net/options/tcp.rs diff --git a/services/aster-nix/src/util/net/options/utils.rs b/kernel/aster-nix/src/util/net/options/utils.rs similarity index 100% rename from services/aster-nix/src/util/net/options/utils.rs rename to kernel/aster-nix/src/util/net/options/utils.rs diff --git a/services/aster-nix/src/util/net/socket.rs b/kernel/aster-nix/src/util/net/socket.rs similarity index 100% rename from services/aster-nix/src/util/net/socket.rs rename to kernel/aster-nix/src/util/net/socket.rs diff --git a/services/aster-nix/src/vdso.rs b/kernel/aster-nix/src/vdso.rs similarity index 100% rename from services/aster-nix/src/vdso.rs rename to kernel/aster-nix/src/vdso.rs diff --git a/services/aster-nix/src/vm/mod.rs b/kernel/aster-nix/src/vm/mod.rs similarity index 100% rename from services/aster-nix/src/vm/mod.rs rename to kernel/aster-nix/src/vm/mod.rs diff --git a/services/aster-nix/src/vm/page_fault_handler.rs b/kernel/aster-nix/src/vm/page_fault_handler.rs similarity index 100% rename from services/aster-nix/src/vm/page_fault_handler.rs rename to kernel/aster-nix/src/vm/page_fault_handler.rs diff --git a/services/aster-nix/src/vm/perms.rs b/kernel/aster-nix/src/vm/perms.rs similarity index 100% rename from services/aster-nix/src/vm/perms.rs rename to kernel/aster-nix/src/vm/perms.rs diff --git a/services/aster-nix/src/vm/vmar/dyn_cap.rs b/kernel/aster-nix/src/vm/vmar/dyn_cap.rs similarity index 100% rename from services/aster-nix/src/vm/vmar/dyn_cap.rs rename to kernel/aster-nix/src/vm/vmar/dyn_cap.rs diff --git a/services/aster-nix/src/vm/vmar/interval.rs b/kernel/aster-nix/src/vm/vmar/interval.rs similarity index 100% rename from services/aster-nix/src/vm/vmar/interval.rs rename to kernel/aster-nix/src/vm/vmar/interval.rs diff --git a/services/aster-nix/src/vm/vmar/mod.rs b/kernel/aster-nix/src/vm/vmar/mod.rs similarity index 100% rename from services/aster-nix/src/vm/vmar/mod.rs rename to kernel/aster-nix/src/vm/vmar/mod.rs diff --git a/services/aster-nix/src/vm/vmar/options.rs b/kernel/aster-nix/src/vm/vmar/options.rs similarity index 100% rename from services/aster-nix/src/vm/vmar/options.rs rename to kernel/aster-nix/src/vm/vmar/options.rs diff --git a/services/aster-nix/src/vm/vmar/static_cap.rs b/kernel/aster-nix/src/vm/vmar/static_cap.rs similarity index 100% rename from services/aster-nix/src/vm/vmar/static_cap.rs rename to kernel/aster-nix/src/vm/vmar/static_cap.rs diff --git a/services/aster-nix/src/vm/vmar/vm_mapping.rs b/kernel/aster-nix/src/vm/vmar/vm_mapping.rs similarity index 100% rename from services/aster-nix/src/vm/vmar/vm_mapping.rs rename to kernel/aster-nix/src/vm/vmar/vm_mapping.rs diff --git a/services/aster-nix/src/vm/vmo/dyn_cap.rs b/kernel/aster-nix/src/vm/vmo/dyn_cap.rs similarity index 100% rename from services/aster-nix/src/vm/vmo/dyn_cap.rs rename to kernel/aster-nix/src/vm/vmo/dyn_cap.rs diff --git a/services/aster-nix/src/vm/vmo/mod.rs b/kernel/aster-nix/src/vm/vmo/mod.rs similarity index 100% rename from services/aster-nix/src/vm/vmo/mod.rs rename to kernel/aster-nix/src/vm/vmo/mod.rs diff --git a/services/aster-nix/src/vm/vmo/options.rs b/kernel/aster-nix/src/vm/vmo/options.rs similarity index 100% rename from services/aster-nix/src/vm/vmo/options.rs rename to kernel/aster-nix/src/vm/vmo/options.rs diff --git a/services/aster-nix/src/vm/vmo/pager.rs b/kernel/aster-nix/src/vm/vmo/pager.rs similarity index 100% rename from services/aster-nix/src/vm/vmo/pager.rs rename to kernel/aster-nix/src/vm/vmo/pager.rs diff --git a/services/aster-nix/src/vm/vmo/static_cap.rs b/kernel/aster-nix/src/vm/vmo/static_cap.rs similarity index 100% rename from services/aster-nix/src/vm/vmo/static_cap.rs rename to kernel/aster-nix/src/vm/vmo/static_cap.rs diff --git a/services/comps/block/Cargo.toml b/kernel/comps/block/Cargo.toml similarity index 100% rename from services/comps/block/Cargo.toml rename to kernel/comps/block/Cargo.toml diff --git a/services/comps/block/src/bio.rs b/kernel/comps/block/src/bio.rs similarity index 100% rename from services/comps/block/src/bio.rs rename to kernel/comps/block/src/bio.rs diff --git a/services/comps/block/src/id.rs b/kernel/comps/block/src/id.rs similarity index 100% rename from services/comps/block/src/id.rs rename to kernel/comps/block/src/id.rs diff --git a/services/comps/block/src/impl_block_device.rs b/kernel/comps/block/src/impl_block_device.rs similarity index 100% rename from services/comps/block/src/impl_block_device.rs rename to kernel/comps/block/src/impl_block_device.rs diff --git a/services/comps/block/src/lib.rs b/kernel/comps/block/src/lib.rs similarity index 100% rename from services/comps/block/src/lib.rs rename to kernel/comps/block/src/lib.rs diff --git a/services/comps/block/src/prelude.rs b/kernel/comps/block/src/prelude.rs similarity index 100% rename from services/comps/block/src/prelude.rs rename to kernel/comps/block/src/prelude.rs diff --git a/services/comps/block/src/request_queue.rs b/kernel/comps/block/src/request_queue.rs similarity index 100% rename from services/comps/block/src/request_queue.rs rename to kernel/comps/block/src/request_queue.rs diff --git a/services/comps/console/Cargo.toml b/kernel/comps/console/Cargo.toml similarity index 100% rename from services/comps/console/Cargo.toml rename to kernel/comps/console/Cargo.toml diff --git a/services/comps/console/src/lib.rs b/kernel/comps/console/src/lib.rs similarity index 100% rename from services/comps/console/src/lib.rs rename to kernel/comps/console/src/lib.rs diff --git a/services/comps/framebuffer/Cargo.toml b/kernel/comps/framebuffer/Cargo.toml similarity index 100% rename from services/comps/framebuffer/Cargo.toml rename to kernel/comps/framebuffer/Cargo.toml diff --git a/services/comps/framebuffer/src/lib.rs b/kernel/comps/framebuffer/src/lib.rs similarity index 100% rename from services/comps/framebuffer/src/lib.rs rename to kernel/comps/framebuffer/src/lib.rs diff --git a/services/comps/input/Cargo.toml b/kernel/comps/input/Cargo.toml similarity index 100% rename from services/comps/input/Cargo.toml rename to kernel/comps/input/Cargo.toml diff --git a/services/comps/input/src/key.rs b/kernel/comps/input/src/key.rs similarity index 100% rename from services/comps/input/src/key.rs rename to kernel/comps/input/src/key.rs diff --git a/services/comps/input/src/lib.rs b/kernel/comps/input/src/lib.rs similarity index 100% rename from services/comps/input/src/lib.rs rename to kernel/comps/input/src/lib.rs diff --git a/services/comps/network/Cargo.toml b/kernel/comps/network/Cargo.toml similarity index 100% rename from services/comps/network/Cargo.toml rename to kernel/comps/network/Cargo.toml diff --git a/services/comps/network/src/buffer.rs b/kernel/comps/network/src/buffer.rs similarity index 100% rename from services/comps/network/src/buffer.rs rename to kernel/comps/network/src/buffer.rs diff --git a/services/comps/network/src/driver.rs b/kernel/comps/network/src/driver.rs similarity index 100% rename from services/comps/network/src/driver.rs rename to kernel/comps/network/src/driver.rs diff --git a/services/comps/network/src/lib.rs b/kernel/comps/network/src/lib.rs similarity index 100% rename from services/comps/network/src/lib.rs rename to kernel/comps/network/src/lib.rs diff --git a/services/comps/time/Cargo.toml b/kernel/comps/time/Cargo.toml similarity index 100% rename from services/comps/time/Cargo.toml rename to kernel/comps/time/Cargo.toml diff --git a/services/comps/time/src/clocksource.rs b/kernel/comps/time/src/clocksource.rs similarity index 100% rename from services/comps/time/src/clocksource.rs rename to kernel/comps/time/src/clocksource.rs diff --git a/services/comps/time/src/lib.rs b/kernel/comps/time/src/lib.rs similarity index 100% rename from services/comps/time/src/lib.rs rename to kernel/comps/time/src/lib.rs diff --git a/services/comps/time/src/rtc.rs b/kernel/comps/time/src/rtc.rs similarity index 100% rename from services/comps/time/src/rtc.rs rename to kernel/comps/time/src/rtc.rs diff --git a/services/comps/time/src/tsc.rs b/kernel/comps/time/src/tsc.rs similarity index 100% rename from services/comps/time/src/tsc.rs rename to kernel/comps/time/src/tsc.rs diff --git a/services/comps/virtio/Cargo.toml b/kernel/comps/virtio/Cargo.toml similarity index 100% rename from services/comps/virtio/Cargo.toml rename to kernel/comps/virtio/Cargo.toml diff --git a/services/comps/virtio/src/device/block/device.rs b/kernel/comps/virtio/src/device/block/device.rs similarity index 100% rename from services/comps/virtio/src/device/block/device.rs rename to kernel/comps/virtio/src/device/block/device.rs diff --git a/services/comps/virtio/src/device/block/mod.rs b/kernel/comps/virtio/src/device/block/mod.rs similarity index 100% rename from services/comps/virtio/src/device/block/mod.rs rename to kernel/comps/virtio/src/device/block/mod.rs diff --git a/services/comps/virtio/src/device/console/config.rs b/kernel/comps/virtio/src/device/console/config.rs similarity index 100% rename from services/comps/virtio/src/device/console/config.rs rename to kernel/comps/virtio/src/device/console/config.rs diff --git a/services/comps/virtio/src/device/console/device.rs b/kernel/comps/virtio/src/device/console/device.rs similarity index 100% rename from services/comps/virtio/src/device/console/device.rs rename to kernel/comps/virtio/src/device/console/device.rs diff --git a/services/comps/virtio/src/device/console/mod.rs b/kernel/comps/virtio/src/device/console/mod.rs similarity index 100% rename from services/comps/virtio/src/device/console/mod.rs rename to kernel/comps/virtio/src/device/console/mod.rs diff --git a/services/comps/virtio/src/device/input/device.rs b/kernel/comps/virtio/src/device/input/device.rs similarity index 100% rename from services/comps/virtio/src/device/input/device.rs rename to kernel/comps/virtio/src/device/input/device.rs diff --git a/services/comps/virtio/src/device/input/mod.rs b/kernel/comps/virtio/src/device/input/mod.rs similarity index 100% rename from services/comps/virtio/src/device/input/mod.rs rename to kernel/comps/virtio/src/device/input/mod.rs diff --git a/services/comps/virtio/src/device/mod.rs b/kernel/comps/virtio/src/device/mod.rs similarity index 100% rename from services/comps/virtio/src/device/mod.rs rename to kernel/comps/virtio/src/device/mod.rs diff --git a/services/comps/virtio/src/device/network/config.rs b/kernel/comps/virtio/src/device/network/config.rs similarity index 100% rename from services/comps/virtio/src/device/network/config.rs rename to kernel/comps/virtio/src/device/network/config.rs diff --git a/services/comps/virtio/src/device/network/device.rs b/kernel/comps/virtio/src/device/network/device.rs similarity index 100% rename from services/comps/virtio/src/device/network/device.rs rename to kernel/comps/virtio/src/device/network/device.rs diff --git a/services/comps/virtio/src/device/network/header.rs b/kernel/comps/virtio/src/device/network/header.rs similarity index 100% rename from services/comps/virtio/src/device/network/header.rs rename to kernel/comps/virtio/src/device/network/header.rs diff --git a/services/comps/virtio/src/device/network/mod.rs b/kernel/comps/virtio/src/device/network/mod.rs similarity index 100% rename from services/comps/virtio/src/device/network/mod.rs rename to kernel/comps/virtio/src/device/network/mod.rs diff --git a/services/comps/virtio/src/lib.rs b/kernel/comps/virtio/src/lib.rs similarity index 100% rename from services/comps/virtio/src/lib.rs rename to kernel/comps/virtio/src/lib.rs diff --git a/services/comps/virtio/src/queue.rs b/kernel/comps/virtio/src/queue.rs similarity index 100% rename from services/comps/virtio/src/queue.rs rename to kernel/comps/virtio/src/queue.rs diff --git a/services/comps/virtio/src/transport/mmio/device.rs b/kernel/comps/virtio/src/transport/mmio/device.rs similarity index 100% rename from services/comps/virtio/src/transport/mmio/device.rs rename to kernel/comps/virtio/src/transport/mmio/device.rs diff --git a/services/comps/virtio/src/transport/mmio/driver.rs b/kernel/comps/virtio/src/transport/mmio/driver.rs similarity index 100% rename from services/comps/virtio/src/transport/mmio/driver.rs rename to kernel/comps/virtio/src/transport/mmio/driver.rs diff --git a/services/comps/virtio/src/transport/mmio/layout.rs b/kernel/comps/virtio/src/transport/mmio/layout.rs similarity index 100% rename from services/comps/virtio/src/transport/mmio/layout.rs rename to kernel/comps/virtio/src/transport/mmio/layout.rs diff --git a/services/comps/virtio/src/transport/mmio/mod.rs b/kernel/comps/virtio/src/transport/mmio/mod.rs similarity index 100% rename from services/comps/virtio/src/transport/mmio/mod.rs rename to kernel/comps/virtio/src/transport/mmio/mod.rs diff --git a/services/comps/virtio/src/transport/mmio/multiplex.rs b/kernel/comps/virtio/src/transport/mmio/multiplex.rs similarity index 100% rename from services/comps/virtio/src/transport/mmio/multiplex.rs rename to kernel/comps/virtio/src/transport/mmio/multiplex.rs diff --git a/services/comps/virtio/src/transport/mod.rs b/kernel/comps/virtio/src/transport/mod.rs similarity index 100% rename from services/comps/virtio/src/transport/mod.rs rename to kernel/comps/virtio/src/transport/mod.rs diff --git a/services/comps/virtio/src/transport/pci/capability.rs b/kernel/comps/virtio/src/transport/pci/capability.rs similarity index 100% rename from services/comps/virtio/src/transport/pci/capability.rs rename to kernel/comps/virtio/src/transport/pci/capability.rs diff --git a/services/comps/virtio/src/transport/pci/common_cfg.rs b/kernel/comps/virtio/src/transport/pci/common_cfg.rs similarity index 100% rename from services/comps/virtio/src/transport/pci/common_cfg.rs rename to kernel/comps/virtio/src/transport/pci/common_cfg.rs diff --git a/services/comps/virtio/src/transport/pci/device.rs b/kernel/comps/virtio/src/transport/pci/device.rs similarity index 100% rename from services/comps/virtio/src/transport/pci/device.rs rename to kernel/comps/virtio/src/transport/pci/device.rs diff --git a/services/comps/virtio/src/transport/pci/driver.rs b/kernel/comps/virtio/src/transport/pci/driver.rs similarity index 100% rename from services/comps/virtio/src/transport/pci/driver.rs rename to kernel/comps/virtio/src/transport/pci/driver.rs diff --git a/services/comps/virtio/src/transport/pci/mod.rs b/kernel/comps/virtio/src/transport/pci/mod.rs similarity index 100% rename from services/comps/virtio/src/transport/pci/mod.rs rename to kernel/comps/virtio/src/transport/pci/mod.rs diff --git a/services/comps/virtio/src/transport/pci/msix.rs b/kernel/comps/virtio/src/transport/pci/msix.rs similarity index 100% rename from services/comps/virtio/src/transport/pci/msix.rs rename to kernel/comps/virtio/src/transport/pci/msix.rs diff --git a/services/libs/aster-rights-proc/Cargo.toml b/kernel/libs/aster-rights-proc/Cargo.toml similarity index 100% rename from services/libs/aster-rights-proc/Cargo.toml rename to kernel/libs/aster-rights-proc/Cargo.toml diff --git a/services/libs/aster-rights-proc/src/lib.rs b/kernel/libs/aster-rights-proc/src/lib.rs similarity index 100% rename from services/libs/aster-rights-proc/src/lib.rs rename to kernel/libs/aster-rights-proc/src/lib.rs diff --git a/services/libs/aster-rights-proc/src/require_attr.rs b/kernel/libs/aster-rights-proc/src/require_attr.rs similarity index 100% rename from services/libs/aster-rights-proc/src/require_attr.rs rename to kernel/libs/aster-rights-proc/src/require_attr.rs diff --git a/services/libs/aster-rights-proc/src/require_item.rs b/kernel/libs/aster-rights-proc/src/require_item.rs similarity index 100% rename from services/libs/aster-rights-proc/src/require_item.rs rename to kernel/libs/aster-rights-proc/src/require_item.rs diff --git a/services/libs/aster-rights/Cargo.toml b/kernel/libs/aster-rights/Cargo.toml similarity index 100% rename from services/libs/aster-rights/Cargo.toml rename to kernel/libs/aster-rights/Cargo.toml diff --git a/services/libs/aster-rights/src/lib.rs b/kernel/libs/aster-rights/src/lib.rs similarity index 100% rename from services/libs/aster-rights/src/lib.rs rename to kernel/libs/aster-rights/src/lib.rs diff --git a/services/libs/aster-util/Cargo.toml b/kernel/libs/aster-util/Cargo.toml similarity index 100% rename from services/libs/aster-util/Cargo.toml rename to kernel/libs/aster-util/Cargo.toml diff --git a/services/libs/aster-util/src/coeff.rs b/kernel/libs/aster-util/src/coeff.rs similarity index 100% rename from services/libs/aster-util/src/coeff.rs rename to kernel/libs/aster-util/src/coeff.rs diff --git a/services/libs/aster-util/src/dup.rs b/kernel/libs/aster-util/src/dup.rs similarity index 100% rename from services/libs/aster-util/src/dup.rs rename to kernel/libs/aster-util/src/dup.rs diff --git a/services/libs/aster-util/src/id_allocator.rs b/kernel/libs/aster-util/src/id_allocator.rs similarity index 100% rename from services/libs/aster-util/src/id_allocator.rs rename to kernel/libs/aster-util/src/id_allocator.rs diff --git a/services/libs/aster-util/src/lib.rs b/kernel/libs/aster-util/src/lib.rs similarity index 100% rename from services/libs/aster-util/src/lib.rs rename to kernel/libs/aster-util/src/lib.rs diff --git a/services/libs/aster-util/src/safe_ptr.rs b/kernel/libs/aster-util/src/safe_ptr.rs similarity index 100% rename from services/libs/aster-util/src/safe_ptr.rs rename to kernel/libs/aster-util/src/safe_ptr.rs diff --git a/services/libs/aster-util/src/slot_vec.rs b/kernel/libs/aster-util/src/slot_vec.rs similarity index 100% rename from services/libs/aster-util/src/slot_vec.rs rename to kernel/libs/aster-util/src/slot_vec.rs diff --git a/services/libs/aster-util/src/union_read_ptr.rs b/kernel/libs/aster-util/src/union_read_ptr.rs similarity index 100% rename from services/libs/aster-util/src/union_read_ptr.rs rename to kernel/libs/aster-util/src/union_read_ptr.rs diff --git a/services/libs/comp-sys/cargo-component/.gitignore b/kernel/libs/comp-sys/cargo-component/.gitignore similarity index 100% rename from services/libs/comp-sys/cargo-component/.gitignore rename to kernel/libs/comp-sys/cargo-component/.gitignore diff --git a/services/libs/comp-sys/cargo-component/Cargo.lock b/kernel/libs/comp-sys/cargo-component/Cargo.lock similarity index 100% rename from services/libs/comp-sys/cargo-component/Cargo.lock rename to kernel/libs/comp-sys/cargo-component/Cargo.lock diff --git a/services/libs/comp-sys/cargo-component/Cargo.toml b/kernel/libs/comp-sys/cargo-component/Cargo.toml similarity index 100% rename from services/libs/comp-sys/cargo-component/Cargo.toml rename to kernel/libs/comp-sys/cargo-component/Cargo.toml diff --git a/services/libs/comp-sys/cargo-component/README.md b/kernel/libs/comp-sys/cargo-component/README.md similarity index 100% rename from services/libs/comp-sys/cargo-component/README.md rename to kernel/libs/comp-sys/cargo-component/README.md diff --git a/services/libs/comp-sys/cargo-component/analysis/Cargo.toml b/kernel/libs/comp-sys/cargo-component/analysis/Cargo.toml similarity index 100% rename from services/libs/comp-sys/cargo-component/analysis/Cargo.toml rename to kernel/libs/comp-sys/cargo-component/analysis/Cargo.toml diff --git a/services/libs/comp-sys/cargo-component/analysis/src/conf.rs b/kernel/libs/comp-sys/cargo-component/analysis/src/conf.rs similarity index 100% rename from services/libs/comp-sys/cargo-component/analysis/src/conf.rs rename to kernel/libs/comp-sys/cargo-component/analysis/src/conf.rs diff --git a/services/libs/comp-sys/cargo-component/analysis/src/lib.rs b/kernel/libs/comp-sys/cargo-component/analysis/src/lib.rs similarity index 100% rename from services/libs/comp-sys/cargo-component/analysis/src/lib.rs rename to kernel/libs/comp-sys/cargo-component/analysis/src/lib.rs diff --git a/services/libs/comp-sys/cargo-component/build.rs b/kernel/libs/comp-sys/cargo-component/build.rs similarity index 100% rename from services/libs/comp-sys/cargo-component/build.rs rename to kernel/libs/comp-sys/cargo-component/build.rs diff --git a/services/libs/comp-sys/cargo-component/rust-toolchain.toml b/kernel/libs/comp-sys/cargo-component/rust-toolchain.toml similarity index 100% rename from services/libs/comp-sys/cargo-component/rust-toolchain.toml rename to kernel/libs/comp-sys/cargo-component/rust-toolchain.toml diff --git a/services/libs/comp-sys/cargo-component/src/driver.rs b/kernel/libs/comp-sys/cargo-component/src/driver.rs similarity index 100% rename from services/libs/comp-sys/cargo-component/src/driver.rs rename to kernel/libs/comp-sys/cargo-component/src/driver.rs diff --git a/services/libs/comp-sys/cargo-component/src/main.rs b/kernel/libs/comp-sys/cargo-component/src/main.rs similarity index 100% rename from services/libs/comp-sys/cargo-component/src/main.rs rename to kernel/libs/comp-sys/cargo-component/src/main.rs diff --git a/services/libs/comp-sys/cargo-component/tests/duplicate_lib_name.rs b/kernel/libs/comp-sys/cargo-component/tests/duplicate_lib_name.rs similarity index 100% rename from services/libs/comp-sys/cargo-component/tests/duplicate_lib_name.rs rename to kernel/libs/comp-sys/cargo-component/tests/duplicate_lib_name.rs diff --git a/services/libs/comp-sys/cargo-component/tests/duplicate_lib_name_test/Cargo.toml b/kernel/libs/comp-sys/cargo-component/tests/duplicate_lib_name_test/Cargo.toml similarity index 100% rename from services/libs/comp-sys/cargo-component/tests/duplicate_lib_name_test/Cargo.toml rename to kernel/libs/comp-sys/cargo-component/tests/duplicate_lib_name_test/Cargo.toml diff --git a/services/libs/comp-sys/cargo-component/tests/duplicate_lib_name_test/Components.toml b/kernel/libs/comp-sys/cargo-component/tests/duplicate_lib_name_test/Components.toml similarity index 100% rename from services/libs/comp-sys/cargo-component/tests/duplicate_lib_name_test/Components.toml rename to kernel/libs/comp-sys/cargo-component/tests/duplicate_lib_name_test/Components.toml diff --git a/services/libs/comp-sys/cargo-component/tests/duplicate_lib_name_test/src/lib.rs b/kernel/libs/comp-sys/cargo-component/tests/duplicate_lib_name_test/src/lib.rs similarity index 100% rename from services/libs/comp-sys/cargo-component/tests/duplicate_lib_name_test/src/lib.rs rename to kernel/libs/comp-sys/cargo-component/tests/duplicate_lib_name_test/src/lib.rs diff --git a/services/libs/comp-sys/cargo-component/tests/missing_toml.rs b/kernel/libs/comp-sys/cargo-component/tests/missing_toml.rs similarity index 100% rename from services/libs/comp-sys/cargo-component/tests/missing_toml.rs rename to kernel/libs/comp-sys/cargo-component/tests/missing_toml.rs diff --git a/services/libs/comp-sys/cargo-component/tests/missing_toml_test/Cargo.toml b/kernel/libs/comp-sys/cargo-component/tests/missing_toml_test/Cargo.toml similarity index 100% rename from services/libs/comp-sys/cargo-component/tests/missing_toml_test/Cargo.toml rename to kernel/libs/comp-sys/cargo-component/tests/missing_toml_test/Cargo.toml diff --git a/services/libs/comp-sys/cargo-component/tests/missing_toml_test/src/lib.rs b/kernel/libs/comp-sys/cargo-component/tests/missing_toml_test/src/lib.rs similarity index 100% rename from services/libs/comp-sys/cargo-component/tests/missing_toml_test/src/lib.rs rename to kernel/libs/comp-sys/cargo-component/tests/missing_toml_test/src/lib.rs diff --git a/services/libs/comp-sys/cargo-component/tests/reexport.rs b/kernel/libs/comp-sys/cargo-component/tests/reexport.rs similarity index 100% rename from services/libs/comp-sys/cargo-component/tests/reexport.rs rename to kernel/libs/comp-sys/cargo-component/tests/reexport.rs diff --git a/services/libs/comp-sys/cargo-component/tests/reexport_test/Cargo.toml b/kernel/libs/comp-sys/cargo-component/tests/reexport_test/Cargo.toml similarity index 100% rename from services/libs/comp-sys/cargo-component/tests/reexport_test/Cargo.toml rename to kernel/libs/comp-sys/cargo-component/tests/reexport_test/Cargo.toml diff --git a/services/libs/comp-sys/cargo-component/tests/reexport_test/Components.toml b/kernel/libs/comp-sys/cargo-component/tests/reexport_test/Components.toml similarity index 100% rename from services/libs/comp-sys/cargo-component/tests/reexport_test/Components.toml rename to kernel/libs/comp-sys/cargo-component/tests/reexport_test/Components.toml diff --git a/services/libs/comp-sys/cargo-component/tests/reexport_test/bar/Cargo.toml b/kernel/libs/comp-sys/cargo-component/tests/reexport_test/bar/Cargo.toml similarity index 100% rename from services/libs/comp-sys/cargo-component/tests/reexport_test/bar/Cargo.toml rename to kernel/libs/comp-sys/cargo-component/tests/reexport_test/bar/Cargo.toml diff --git a/services/libs/comp-sys/cargo-component/tests/reexport_test/bar/src/lib.rs b/kernel/libs/comp-sys/cargo-component/tests/reexport_test/bar/src/lib.rs similarity index 100% rename from services/libs/comp-sys/cargo-component/tests/reexport_test/bar/src/lib.rs rename to kernel/libs/comp-sys/cargo-component/tests/reexport_test/bar/src/lib.rs diff --git a/services/libs/comp-sys/cargo-component/tests/reexport_test/baz/Cargo.toml b/kernel/libs/comp-sys/cargo-component/tests/reexport_test/baz/Cargo.toml similarity index 100% rename from services/libs/comp-sys/cargo-component/tests/reexport_test/baz/Cargo.toml rename to kernel/libs/comp-sys/cargo-component/tests/reexport_test/baz/Cargo.toml diff --git a/services/libs/comp-sys/cargo-component/tests/reexport_test/baz/src/lib.rs b/kernel/libs/comp-sys/cargo-component/tests/reexport_test/baz/src/lib.rs similarity index 100% rename from services/libs/comp-sys/cargo-component/tests/reexport_test/baz/src/lib.rs rename to kernel/libs/comp-sys/cargo-component/tests/reexport_test/baz/src/lib.rs diff --git a/services/libs/comp-sys/cargo-component/tests/reexport_test/foo/Cargo.toml b/kernel/libs/comp-sys/cargo-component/tests/reexport_test/foo/Cargo.toml similarity index 100% rename from services/libs/comp-sys/cargo-component/tests/reexport_test/foo/Cargo.toml rename to kernel/libs/comp-sys/cargo-component/tests/reexport_test/foo/Cargo.toml diff --git a/services/libs/comp-sys/cargo-component/tests/reexport_test/foo/src/lib.rs b/kernel/libs/comp-sys/cargo-component/tests/reexport_test/foo/src/lib.rs similarity index 100% rename from services/libs/comp-sys/cargo-component/tests/reexport_test/foo/src/lib.rs rename to kernel/libs/comp-sys/cargo-component/tests/reexport_test/foo/src/lib.rs diff --git a/services/libs/comp-sys/cargo-component/tests/regression.rs b/kernel/libs/comp-sys/cargo-component/tests/regression.rs similarity index 100% rename from services/libs/comp-sys/cargo-component/tests/regression.rs rename to kernel/libs/comp-sys/cargo-component/tests/regression.rs diff --git a/services/libs/comp-sys/cargo-component/tests/regression_test/Cargo.toml b/kernel/libs/comp-sys/cargo-component/tests/regression_test/Cargo.toml similarity index 100% rename from services/libs/comp-sys/cargo-component/tests/regression_test/Cargo.toml rename to kernel/libs/comp-sys/cargo-component/tests/regression_test/Cargo.toml diff --git a/services/libs/comp-sys/cargo-component/tests/regression_test/Components.toml b/kernel/libs/comp-sys/cargo-component/tests/regression_test/Components.toml similarity index 100% rename from services/libs/comp-sys/cargo-component/tests/regression_test/Components.toml rename to kernel/libs/comp-sys/cargo-component/tests/regression_test/Components.toml diff --git a/services/libs/comp-sys/cargo-component/tests/regression_test/bar1/Cargo.toml b/kernel/libs/comp-sys/cargo-component/tests/regression_test/bar1/Cargo.toml similarity index 100% rename from services/libs/comp-sys/cargo-component/tests/regression_test/bar1/Cargo.toml rename to kernel/libs/comp-sys/cargo-component/tests/regression_test/bar1/Cargo.toml diff --git a/services/libs/comp-sys/cargo-component/tests/regression_test/bar1/src/lib.rs b/kernel/libs/comp-sys/cargo-component/tests/regression_test/bar1/src/lib.rs similarity index 100% rename from services/libs/comp-sys/cargo-component/tests/regression_test/bar1/src/lib.rs rename to kernel/libs/comp-sys/cargo-component/tests/regression_test/bar1/src/lib.rs diff --git a/services/libs/comp-sys/cargo-component/tests/regression_test/foo1/Cargo.toml b/kernel/libs/comp-sys/cargo-component/tests/regression_test/foo1/Cargo.toml similarity index 100% rename from services/libs/comp-sys/cargo-component/tests/regression_test/foo1/Cargo.toml rename to kernel/libs/comp-sys/cargo-component/tests/regression_test/foo1/Cargo.toml diff --git a/services/libs/comp-sys/cargo-component/tests/regression_test/foo1/src/lib.rs b/kernel/libs/comp-sys/cargo-component/tests/regression_test/foo1/src/lib.rs similarity index 100% rename from services/libs/comp-sys/cargo-component/tests/regression_test/foo1/src/lib.rs rename to kernel/libs/comp-sys/cargo-component/tests/regression_test/foo1/src/lib.rs diff --git a/services/libs/comp-sys/cargo-component/tests/test_utils/mod.rs b/kernel/libs/comp-sys/cargo-component/tests/test_utils/mod.rs similarity index 100% rename from services/libs/comp-sys/cargo-component/tests/test_utils/mod.rs rename to kernel/libs/comp-sys/cargo-component/tests/test_utils/mod.rs diff --git a/services/libs/comp-sys/cargo-component/tests/trait_method.rs b/kernel/libs/comp-sys/cargo-component/tests/trait_method.rs similarity index 100% rename from services/libs/comp-sys/cargo-component/tests/trait_method.rs rename to kernel/libs/comp-sys/cargo-component/tests/trait_method.rs diff --git a/services/libs/comp-sys/cargo-component/tests/trait_method_test/Cargo.toml b/kernel/libs/comp-sys/cargo-component/tests/trait_method_test/Cargo.toml similarity index 100% rename from services/libs/comp-sys/cargo-component/tests/trait_method_test/Cargo.toml rename to kernel/libs/comp-sys/cargo-component/tests/trait_method_test/Cargo.toml diff --git a/services/libs/comp-sys/cargo-component/tests/trait_method_test/Components.toml b/kernel/libs/comp-sys/cargo-component/tests/trait_method_test/Components.toml similarity index 100% rename from services/libs/comp-sys/cargo-component/tests/trait_method_test/Components.toml rename to kernel/libs/comp-sys/cargo-component/tests/trait_method_test/Components.toml diff --git a/services/libs/comp-sys/cargo-component/tests/trait_method_test/bar2/Cargo.toml b/kernel/libs/comp-sys/cargo-component/tests/trait_method_test/bar2/Cargo.toml similarity index 100% rename from services/libs/comp-sys/cargo-component/tests/trait_method_test/bar2/Cargo.toml rename to kernel/libs/comp-sys/cargo-component/tests/trait_method_test/bar2/Cargo.toml diff --git a/services/libs/comp-sys/cargo-component/tests/trait_method_test/bar2/src/lib.rs b/kernel/libs/comp-sys/cargo-component/tests/trait_method_test/bar2/src/lib.rs similarity index 100% rename from services/libs/comp-sys/cargo-component/tests/trait_method_test/bar2/src/lib.rs rename to kernel/libs/comp-sys/cargo-component/tests/trait_method_test/bar2/src/lib.rs diff --git a/services/libs/comp-sys/cargo-component/tests/trait_method_test/foo2/Cargo.toml b/kernel/libs/comp-sys/cargo-component/tests/trait_method_test/foo2/Cargo.toml similarity index 100% rename from services/libs/comp-sys/cargo-component/tests/trait_method_test/foo2/Cargo.toml rename to kernel/libs/comp-sys/cargo-component/tests/trait_method_test/foo2/Cargo.toml diff --git a/services/libs/comp-sys/cargo-component/tests/trait_method_test/foo2/src/lib.rs b/kernel/libs/comp-sys/cargo-component/tests/trait_method_test/foo2/src/lib.rs similarity index 100% rename from services/libs/comp-sys/cargo-component/tests/trait_method_test/foo2/src/lib.rs rename to kernel/libs/comp-sys/cargo-component/tests/trait_method_test/foo2/src/lib.rs diff --git a/services/libs/comp-sys/cargo-component/tests/violate_policy.rs b/kernel/libs/comp-sys/cargo-component/tests/violate_policy.rs similarity index 100% rename from services/libs/comp-sys/cargo-component/tests/violate_policy.rs rename to kernel/libs/comp-sys/cargo-component/tests/violate_policy.rs diff --git a/services/libs/comp-sys/cargo-component/tests/violate_policy_test/Cargo.toml b/kernel/libs/comp-sys/cargo-component/tests/violate_policy_test/Cargo.toml similarity index 100% rename from services/libs/comp-sys/cargo-component/tests/violate_policy_test/Cargo.toml rename to kernel/libs/comp-sys/cargo-component/tests/violate_policy_test/Cargo.toml diff --git a/services/libs/comp-sys/cargo-component/tests/violate_policy_test/Components.toml b/kernel/libs/comp-sys/cargo-component/tests/violate_policy_test/Components.toml similarity index 100% rename from services/libs/comp-sys/cargo-component/tests/violate_policy_test/Components.toml rename to kernel/libs/comp-sys/cargo-component/tests/violate_policy_test/Components.toml diff --git a/services/libs/comp-sys/cargo-component/tests/violate_policy_test/bar3/Cargo.toml b/kernel/libs/comp-sys/cargo-component/tests/violate_policy_test/bar3/Cargo.toml similarity index 100% rename from services/libs/comp-sys/cargo-component/tests/violate_policy_test/bar3/Cargo.toml rename to kernel/libs/comp-sys/cargo-component/tests/violate_policy_test/bar3/Cargo.toml diff --git a/services/libs/comp-sys/cargo-component/tests/violate_policy_test/bar3/src/lib.rs b/kernel/libs/comp-sys/cargo-component/tests/violate_policy_test/bar3/src/lib.rs similarity index 100% rename from services/libs/comp-sys/cargo-component/tests/violate_policy_test/bar3/src/lib.rs rename to kernel/libs/comp-sys/cargo-component/tests/violate_policy_test/bar3/src/lib.rs diff --git a/services/libs/comp-sys/cargo-component/tests/violate_policy_test/foo3/Cargo.toml b/kernel/libs/comp-sys/cargo-component/tests/violate_policy_test/foo3/Cargo.toml similarity index 100% rename from services/libs/comp-sys/cargo-component/tests/violate_policy_test/foo3/Cargo.toml rename to kernel/libs/comp-sys/cargo-component/tests/violate_policy_test/foo3/Cargo.toml diff --git a/services/libs/comp-sys/cargo-component/tests/violate_policy_test/foo3/src/lib.rs b/kernel/libs/comp-sys/cargo-component/tests/violate_policy_test/foo3/src/lib.rs similarity index 100% rename from services/libs/comp-sys/cargo-component/tests/violate_policy_test/foo3/src/lib.rs rename to kernel/libs/comp-sys/cargo-component/tests/violate_policy_test/foo3/src/lib.rs diff --git a/services/libs/comp-sys/component-macro/Cargo.toml b/kernel/libs/comp-sys/component-macro/Cargo.toml similarity index 100% rename from services/libs/comp-sys/component-macro/Cargo.toml rename to kernel/libs/comp-sys/component-macro/Cargo.toml diff --git a/services/libs/comp-sys/component-macro/src/init_comp.rs b/kernel/libs/comp-sys/component-macro/src/init_comp.rs similarity index 100% rename from services/libs/comp-sys/component-macro/src/init_comp.rs rename to kernel/libs/comp-sys/component-macro/src/init_comp.rs diff --git a/services/libs/comp-sys/component-macro/src/lib.rs b/kernel/libs/comp-sys/component-macro/src/lib.rs similarity index 100% rename from services/libs/comp-sys/component-macro/src/lib.rs rename to kernel/libs/comp-sys/component-macro/src/lib.rs diff --git a/services/libs/comp-sys/component-macro/src/priority.rs b/kernel/libs/comp-sys/component-macro/src/priority.rs similarity index 100% rename from services/libs/comp-sys/component-macro/src/priority.rs rename to kernel/libs/comp-sys/component-macro/src/priority.rs diff --git a/services/libs/comp-sys/component/Cargo.toml b/kernel/libs/comp-sys/component/Cargo.toml similarity index 100% rename from services/libs/comp-sys/component/Cargo.toml rename to kernel/libs/comp-sys/component/Cargo.toml diff --git a/services/libs/comp-sys/component/README.md b/kernel/libs/comp-sys/component/README.md similarity index 100% rename from services/libs/comp-sys/component/README.md rename to kernel/libs/comp-sys/component/README.md diff --git a/services/libs/comp-sys/component/src/lib.rs b/kernel/libs/comp-sys/component/src/lib.rs similarity index 100% rename from services/libs/comp-sys/component/src/lib.rs rename to kernel/libs/comp-sys/component/src/lib.rs diff --git a/services/libs/comp-sys/component/tests/init-order/Cargo.toml b/kernel/libs/comp-sys/component/tests/init-order/Cargo.toml similarity index 100% rename from services/libs/comp-sys/component/tests/init-order/Cargo.toml rename to kernel/libs/comp-sys/component/tests/init-order/Cargo.toml diff --git a/services/libs/comp-sys/component/tests/init-order/Components.toml b/kernel/libs/comp-sys/component/tests/init-order/Components.toml similarity index 100% rename from services/libs/comp-sys/component/tests/init-order/Components.toml rename to kernel/libs/comp-sys/component/tests/init-order/Components.toml diff --git a/services/libs/comp-sys/component/tests/init-order/first-init/Cargo.toml b/kernel/libs/comp-sys/component/tests/init-order/first-init/Cargo.toml similarity index 100% rename from services/libs/comp-sys/component/tests/init-order/first-init/Cargo.toml rename to kernel/libs/comp-sys/component/tests/init-order/first-init/Cargo.toml diff --git a/services/libs/comp-sys/component/tests/init-order/first-init/src/lib.rs b/kernel/libs/comp-sys/component/tests/init-order/first-init/src/lib.rs similarity index 100% rename from services/libs/comp-sys/component/tests/init-order/first-init/src/lib.rs rename to kernel/libs/comp-sys/component/tests/init-order/first-init/src/lib.rs diff --git a/services/libs/comp-sys/component/tests/init-order/second-init/Cargo.toml b/kernel/libs/comp-sys/component/tests/init-order/second-init/Cargo.toml similarity index 100% rename from services/libs/comp-sys/component/tests/init-order/second-init/Cargo.toml rename to kernel/libs/comp-sys/component/tests/init-order/second-init/Cargo.toml diff --git a/services/libs/comp-sys/component/tests/init-order/second-init/src/lib.rs b/kernel/libs/comp-sys/component/tests/init-order/second-init/src/lib.rs similarity index 100% rename from services/libs/comp-sys/component/tests/init-order/second-init/src/lib.rs rename to kernel/libs/comp-sys/component/tests/init-order/second-init/src/lib.rs diff --git a/services/libs/comp-sys/component/tests/init-order/second-init/tests/test.rs b/kernel/libs/comp-sys/component/tests/init-order/second-init/tests/test.rs similarity index 100% rename from services/libs/comp-sys/component/tests/init-order/second-init/tests/test.rs rename to kernel/libs/comp-sys/component/tests/init-order/second-init/tests/test.rs diff --git a/services/libs/comp-sys/component/tests/init-order/src/main.rs b/kernel/libs/comp-sys/component/tests/init-order/src/main.rs similarity index 100% rename from services/libs/comp-sys/component/tests/init-order/src/main.rs rename to kernel/libs/comp-sys/component/tests/init-order/src/main.rs diff --git a/services/libs/comp-sys/component/tests/init-order/tests/test.rs b/kernel/libs/comp-sys/component/tests/init-order/tests/test.rs similarity index 100% rename from services/libs/comp-sys/component/tests/init-order/tests/test.rs rename to kernel/libs/comp-sys/component/tests/init-order/tests/test.rs diff --git a/services/libs/comp-sys/controlled/Cargo.toml b/kernel/libs/comp-sys/controlled/Cargo.toml similarity index 100% rename from services/libs/comp-sys/controlled/Cargo.toml rename to kernel/libs/comp-sys/controlled/Cargo.toml diff --git a/services/libs/comp-sys/controlled/src/lib.rs b/kernel/libs/comp-sys/controlled/src/lib.rs similarity index 100% rename from services/libs/comp-sys/controlled/src/lib.rs rename to kernel/libs/comp-sys/controlled/src/lib.rs diff --git a/services/libs/cpio-decoder/Cargo.toml b/kernel/libs/cpio-decoder/Cargo.toml similarity index 100% rename from services/libs/cpio-decoder/Cargo.toml rename to kernel/libs/cpio-decoder/Cargo.toml diff --git a/services/libs/cpio-decoder/src/error.rs b/kernel/libs/cpio-decoder/src/error.rs similarity index 100% rename from services/libs/cpio-decoder/src/error.rs rename to kernel/libs/cpio-decoder/src/error.rs diff --git a/services/libs/cpio-decoder/src/lib.rs b/kernel/libs/cpio-decoder/src/lib.rs similarity index 100% rename from services/libs/cpio-decoder/src/lib.rs rename to kernel/libs/cpio-decoder/src/lib.rs diff --git a/services/libs/cpio-decoder/src/test.rs b/kernel/libs/cpio-decoder/src/test.rs similarity index 100% rename from services/libs/cpio-decoder/src/test.rs rename to kernel/libs/cpio-decoder/src/test.rs diff --git a/services/libs/int-to-c-enum/.gitignore b/kernel/libs/int-to-c-enum/.gitignore similarity index 100% rename from services/libs/int-to-c-enum/.gitignore rename to kernel/libs/int-to-c-enum/.gitignore diff --git a/services/libs/int-to-c-enum/Cargo.toml b/kernel/libs/int-to-c-enum/Cargo.toml similarity index 100% rename from services/libs/int-to-c-enum/Cargo.toml rename to kernel/libs/int-to-c-enum/Cargo.toml diff --git a/services/libs/int-to-c-enum/README.md b/kernel/libs/int-to-c-enum/README.md similarity index 100% rename from services/libs/int-to-c-enum/README.md rename to kernel/libs/int-to-c-enum/README.md diff --git a/services/libs/int-to-c-enum/derive/Cargo.toml b/kernel/libs/int-to-c-enum/derive/Cargo.toml similarity index 100% rename from services/libs/int-to-c-enum/derive/Cargo.toml rename to kernel/libs/int-to-c-enum/derive/Cargo.toml diff --git a/services/libs/int-to-c-enum/derive/src/lib.rs b/kernel/libs/int-to-c-enum/derive/src/lib.rs similarity index 100% rename from services/libs/int-to-c-enum/derive/src/lib.rs rename to kernel/libs/int-to-c-enum/derive/src/lib.rs diff --git a/services/libs/int-to-c-enum/src/lib.rs b/kernel/libs/int-to-c-enum/src/lib.rs similarity index 100% rename from services/libs/int-to-c-enum/src/lib.rs rename to kernel/libs/int-to-c-enum/src/lib.rs diff --git a/services/libs/int-to-c-enum/tests/regression.rs b/kernel/libs/int-to-c-enum/tests/regression.rs similarity index 100% rename from services/libs/int-to-c-enum/tests/regression.rs rename to kernel/libs/int-to-c-enum/tests/regression.rs diff --git a/services/libs/keyable-arc/Cargo.toml b/kernel/libs/keyable-arc/Cargo.toml similarity index 100% rename from services/libs/keyable-arc/Cargo.toml rename to kernel/libs/keyable-arc/Cargo.toml diff --git a/services/libs/keyable-arc/src/lib.rs b/kernel/libs/keyable-arc/src/lib.rs similarity index 100% rename from services/libs/keyable-arc/src/lib.rs rename to kernel/libs/keyable-arc/src/lib.rs diff --git a/services/libs/typeflags-util/Cargo.toml b/kernel/libs/typeflags-util/Cargo.toml similarity index 100% rename from services/libs/typeflags-util/Cargo.toml rename to kernel/libs/typeflags-util/Cargo.toml diff --git a/services/libs/typeflags-util/src/assert.rs b/kernel/libs/typeflags-util/src/assert.rs similarity index 100% rename from services/libs/typeflags-util/src/assert.rs rename to kernel/libs/typeflags-util/src/assert.rs diff --git a/services/libs/typeflags-util/src/bool.rs b/kernel/libs/typeflags-util/src/bool.rs similarity index 100% rename from services/libs/typeflags-util/src/bool.rs rename to kernel/libs/typeflags-util/src/bool.rs diff --git a/services/libs/typeflags-util/src/extend.rs b/kernel/libs/typeflags-util/src/extend.rs similarity index 100% rename from services/libs/typeflags-util/src/extend.rs rename to kernel/libs/typeflags-util/src/extend.rs diff --git a/services/libs/typeflags-util/src/if_.rs b/kernel/libs/typeflags-util/src/if_.rs similarity index 100% rename from services/libs/typeflags-util/src/if_.rs rename to kernel/libs/typeflags-util/src/if_.rs diff --git a/services/libs/typeflags-util/src/lib.rs b/kernel/libs/typeflags-util/src/lib.rs similarity index 100% rename from services/libs/typeflags-util/src/lib.rs rename to kernel/libs/typeflags-util/src/lib.rs diff --git a/services/libs/typeflags-util/src/same.rs b/kernel/libs/typeflags-util/src/same.rs similarity index 100% rename from services/libs/typeflags-util/src/same.rs rename to kernel/libs/typeflags-util/src/same.rs diff --git a/services/libs/typeflags-util/src/set.rs b/kernel/libs/typeflags-util/src/set.rs similarity index 100% rename from services/libs/typeflags-util/src/set.rs rename to kernel/libs/typeflags-util/src/set.rs diff --git a/services/libs/typeflags/Cargo.toml b/kernel/libs/typeflags/Cargo.toml similarity index 100% rename from services/libs/typeflags/Cargo.toml rename to kernel/libs/typeflags/Cargo.toml diff --git a/services/libs/typeflags/src/flag_set.rs b/kernel/libs/typeflags/src/flag_set.rs similarity index 100% rename from services/libs/typeflags/src/flag_set.rs rename to kernel/libs/typeflags/src/flag_set.rs diff --git a/services/libs/typeflags/src/lib.rs b/kernel/libs/typeflags/src/lib.rs similarity index 100% rename from services/libs/typeflags/src/lib.rs rename to kernel/libs/typeflags/src/lib.rs diff --git a/services/libs/typeflags/src/type_flag.rs b/kernel/libs/typeflags/src/type_flag.rs similarity index 100% rename from services/libs/typeflags/src/type_flag.rs rename to kernel/libs/typeflags/src/type_flag.rs diff --git a/services/libs/typeflags/src/util.rs b/kernel/libs/typeflags/src/util.rs similarity index 100% rename from services/libs/typeflags/src/util.rs rename to kernel/libs/typeflags/src/util.rs diff --git a/src/lib.rs b/kernel/src/lib.rs similarity index 100% rename from src/lib.rs rename to kernel/src/lib.rs