diff --git a/src/app/app.c b/src/app/app.c
deleted file mode 100644
index 48498f5a..00000000
--- a/src/app/app.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "app.h"
-
-#include "app_core.c"
diff --git a/src/app/app.h b/src/app/app.h
deleted file mode 100644
index e951dec7..00000000
--- a/src/app/app.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef APP_H
-#define APP_H
-
-#include "../base/base.h"
-#include "../platform/platform.h"
-#include "../ttf/ttf.h"
-#include "../gpu/gpu.h"
-#include "../sprite/sprite.h"
-#include "../watch/watch.h"
-#include "../draw/draw.h"
-#include "../sound/sound.h"
-#include "../font/font.h"
-#include "../asset_cache/asset_cache.h"
-#include "../mixer/mixer.h"
-#include "../settings/settings.h"
-#include "../net/net.h"
-#include "../resource/resource.h"
-#include "../playback/playback.h"
-#include "../pp/pp.h"
-
-#include "app_core.h"
-
-#endif
diff --git a/src/app/app.lay b/src/app/app.lay
new file mode 100644
index 00000000..f54ee3f6
--- /dev/null
+++ b/src/app/app.lay
@@ -0,0 +1,26 @@
+@Layer app
+
+////////////////////////////////
+//~ Dependencies
+
+@Dep base
+@Dep platform
+@Dep ttf
+@Dep gpu
+@Dep sprite
+@Dep watch
+@Dep draw
+@Dep sound
+@Dep font
+@Dep asset_cache
+@Dep mixer
+@Dep settings
+@Dep net
+@Dep resource
+@Dep playback
+@Dep pp
+
+////////////////////////////////
+//~ Api
+
+@CpuApi app_core
diff --git a/src/ase/ase.c b/src/ase/ase.c
deleted file mode 100644
index f7efc70b..00000000
--- a/src/ase/ase.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "ase.h"
-
-#include "ase_core.c"
-void ASE_Main(void)
-{
-    RunOnce();
-    ASE_StartupDeps();
-}
diff --git a/src/ase/ase.h b/src/ase/ase.h
deleted file mode 100644
index 3500c41e..00000000
--- a/src/ase/ase.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef ASE_H
-#define ASE_H
-
-////////////////////////////////
-//~ Layer dependencies
-
-#include "../base/base.h"
-#include "../bitbuff/bitbuff.h"
-inline void ASE_StartupDeps(void)
-{
-    BaseMain();
-    BB_Main();
-}
-
-////////////////////////////////
-//~ Layer headers
-
-#include "ase_core.h"
-void ASE_Main(void);
-
-#endif
diff --git a/src/ase/ase.lay b/src/ase/ase.lay
new file mode 100644
index 00000000..aad7f87c
--- /dev/null
+++ b/src/ase/ase.lay
@@ -0,0 +1,12 @@
+@Layer ase
+
+////////////////////////////////
+//~ Dependencies
+
+@Dep base
+@Dep bitbuff
+
+////////////////////////////////
+//~ Api
+
+@CpuApi ase_core
diff --git a/src/asset_cache/asset_cache.c b/src/asset_cache/asset_cache.c
deleted file mode 100644
index b5fc6e65..00000000
--- a/src/asset_cache/asset_cache.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "asset_cache.h"
-
-#include "asset_cache_core.c"
-void AC_Main(void)
-{
-    RunOnce();
-    AC_StartupDeps();
-    AC_StartupCore();
-}
diff --git a/src/asset_cache/asset_cache.h b/src/asset_cache/asset_cache.h
deleted file mode 100644
index 1aa0d469..00000000
--- a/src/asset_cache/asset_cache.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef ASSET_CACHE_H
-#define ASSET_CACHE_H
-
-////////////////////////////////
-//~ Layer dependencies
-
-#include "../base/base.h"
-#include "../platform/platform.h"
-void AC_Main(void);
-inline void AC_StartupDeps(void)
-{
-    BaseMain();
-    P_Main();
-}
-
-////////////////////////////////
-//~ Layer headers
-
-#include "asset_cache_core.h"
-
-#endif
diff --git a/src/asset_cache/asset_cache.lay b/src/asset_cache/asset_cache.lay
new file mode 100644
index 00000000..2283585e
--- /dev/null
+++ b/src/asset_cache/asset_cache.lay
@@ -0,0 +1,17 @@
+@Layer asset_cache
+
+////////////////////////////////
+//~ Dependencies
+
+@Dep base
+@Dep platform
+
+////////////////////////////////
+//~ Api
+
+@CpuApi asset_cache_core
+
+////////////////////////////////
+//~ Init
+
+@Init AC_StartupCore
diff --git a/src/base/base.c b/src/base/base.c
deleted file mode 100644
index 2f6fd43d..00000000
--- a/src/base/base.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#include "base.h"
-
-#include "base_arena.c"
-#include "base_gstat.c"
-#include "base_memory.c"
-#include "base_buddy.c"
-#include "base_math.c"
-#include "base_rand.c"
-#include "base_string.c"
-#include "base_uid.c"
-#include "base_uni.c"
-#include "base_incbin.c"
-#include "base_snc.c"
-
-#if PlatformIsWindows
-#include "win32/base_win32_job.c"
-#include "win32/base_win32_entry.c"
-#else
-# error Base layer platform backend not implemented
-#endif
-
-void BaseMain(void)
-{
-    RunOnce();
-    StartupBaseDeps();
-    StartupBaseJobs();
-}
diff --git a/src/base/base.h b/src/base/base.h
deleted file mode 100644
index ad8c77a8..00000000
--- a/src/base/base.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef BASE_H
-#define BASE_H
-
-////////////////////////////////
-//~ Layer dependencies
-
-inline void StartupBaseDeps(void)
-{
-}
-
-////////////////////////////////
-//~ Layer headers
-
-#include "base_core.h"
-
-#if LanguageIsC || LanguageIsCpp
-//- Base cpu includes
-#include "../prof/prof.h"
-# include "base_intrinsics.h"
-# include "base_memory.h"
-# include "base_arena.h"
-# include "base_snc.h"
-# include "base_job.h"
-# include "base_uid.h"
-# include "base_string.h"
-# include "base_uni.h"
-# include "base_gstat.h"
-# include "base_buddy.h"
-# include "base_math.h"
-# include "base_rand.h"
-# include "base_util.h"
-# include "base_incbin.h"
-# include "base_entry.h"
-#if PlatformIsWindows
-# include "win32/base_win32_job.h"
-# include "win32/base_win32_entry.h"
-#endif
-void BaseMain(void);
-
-#elif LanguageIsGpu
-//- Base gpu includes
-# include "base_math_gpu.h"
-#endif
-
-#endif
diff --git a/src/base/base.lay b/src/base/base.lay
new file mode 100644
index 00000000..3efbba4b
--- /dev/null
+++ b/src/base/base.lay
@@ -0,0 +1,34 @@
+@Layer base
+
+////////////////////////////////
+//~ Api
+
+@CpuApi base_core
+@GpuApi base_core
+
+@CpuApi base_intrinsics
+@CpuApi base_memory
+@CpuApi base_arena
+@CpuApi base_snc
+@CpuApi base_job
+@CpuApi base_uid
+@CpuApi base_string
+@CpuApi base_uni
+@CpuApi base_gstat
+@CpuApi base_buddy
+@CpuApi base_math
+@CpuApi base_rand
+@CpuApi base_util
+@CpuApi base_incbin
+@CpuApi base_entry
+
+@GpuApi base_math_gpu
+
+//- Win32
+@CpuApiWindows win32/base_win32_job
+@CpuApiWindows win32/base_win32_entry
+
+////////////////////////////////
+//~ Init
+
+@Init StartupBaseJobs
diff --git a/src/base/build.bat b/src/base/build.bat
deleted file mode 100644
index fbd1a8ee..00000000
--- a/src/base/build.bat
+++ /dev/null
@@ -1,7 +0,0 @@
-@echo off
-
-set opts=-FC -GR- -EHa- -nologo -Zi
-set code=%cd%
-pushd build
-cl %opts% %code%\build.c -Febuild
-popd
diff --git a/src/base/build.sh b/src/base/build.sh
deleted file mode 100644
index e1582689..00000000
--- a/src/base/build.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-code="$PWD"
-opts=-g
-cd build > /dev/null
-g++ $opts $code/build.c -o build
-cd $code > /dev/null
diff --git a/src/bitbuff/bitbuff.c b/src/bitbuff/bitbuff.c
deleted file mode 100644
index b1a9256a..00000000
--- a/src/bitbuff/bitbuff.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "bitbuff.h"
-
-#include "bitbuff_core.c"
-void BB_Main(void)
-{
-    RunOnce();
-    BB_StartupDeps();
-}
diff --git a/src/bitbuff/bitbuff.h b/src/bitbuff/bitbuff.h
deleted file mode 100644
index dd2c26ad..00000000
--- a/src/bitbuff/bitbuff.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef BITBUFF_H
-#define BITBUFF_H
-
-////////////////////////////////
-//~ Layer dependencies
-
-#include "../base/base.h"
-inline void BB_StartupDeps(void)
-{
-    BaseMain();
-}
-
-////////////////////////////////
-//~ Layer headers
-
-#include "bitbuff_core.h"
-void BB_Main(void);
-
-#endif
diff --git a/src/bitbuff/bitbuff.lay b/src/bitbuff/bitbuff.lay
new file mode 100644
index 00000000..c06f88f6
--- /dev/null
+++ b/src/bitbuff/bitbuff.lay
@@ -0,0 +1,11 @@
+@Layer bitbuff
+
+////////////////////////////////
+//~ Dependencies
+
+@dep base
+
+////////////////////////////////
+//~ Api
+
+@CpuApi bitbuff_core
diff --git a/src/collider/collider.c b/src/collider/collider.c
deleted file mode 100644
index 7479fdaf..00000000
--- a/src/collider/collider.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "collider.h"
-
-#include "collider_core.c"
-void CLD_Main(void)
-{
-    RunOnce();
-    CLD_StartupDeps();
-}
diff --git a/src/collider/collider.h b/src/collider/collider.h
deleted file mode 100644
index 2becf8fc..00000000
--- a/src/collider/collider.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef COLLIDER_H
-#define COLLIDER_H
-
-////////////////////////////////
-//~ Layer dependencies
-
-#include "../base/base.h"
-inline void CLD_StartupDeps(void)
-{
-    BaseMain();
-}
-
-////////////////////////////////
-//~ Layer headers
-
-#include "collider_core.h"
-void CLD_Main(void);
-
-#endif
diff --git a/src/collider/collider.lay b/src/collider/collider.lay
new file mode 100644
index 00000000..2ec0d1aa
--- /dev/null
+++ b/src/collider/collider.lay
@@ -0,0 +1,11 @@
+@Layer collider
+
+////////////////////////////////
+//~ Dependencies
+
+@Dep base
+
+////////////////////////////////
+//~ Api
+
+@CpuApi collider_core
diff --git a/src/draw/draw.c b/src/draw/draw.c
deleted file mode 100644
index 4c5ade94..00000000
--- a/src/draw/draw.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "draw.h"
-
-#include "draw_core.c"
-void D_Main(void)
-{
-    RunOnce();
-    D_StartupDeps();
-    D_StartupCore();
-}
diff --git a/src/draw/draw.h b/src/draw/draw.h
deleted file mode 100644
index 21e5a832..00000000
--- a/src/draw/draw.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef DRAW_H
-#define DRAW_H
-
-////////////////////////////////
-//~ Layer dependencies
-
-#include "../base/base.h"
-#include "../gpu/gpu.h"
-#include "../sprite/sprite.h"
-#include "../font/font.h"
-#include "../collider/collider.h"
-inline void D_StartupDeps(void)
-{
-    BaseMain();
-    GPU_Main();
-    S_Main();
-    F_Main();
-    CLD_Main();
-}
-
-////////////////////////////////
-//~ Layer headers
-
-#include "draw_core.h"
-void D_Main(void);
-
-#endif
diff --git a/src/draw/draw.lay b/src/draw/draw.lay
new file mode 100644
index 00000000..95f5e9ea
--- /dev/null
+++ b/src/draw/draw.lay
@@ -0,0 +1,20 @@
+@Layer draw
+
+////////////////////////////////
+//~ Dependencies
+
+@Dep base
+@Dep gpu
+@Dep sprite
+@Dep font
+@Dep collider
+
+////////////////////////////////
+//~ Api
+
+@CpuApi draw_core
+
+////////////////////////////////
+//~ Init
+
+@Init D_StartupCore
diff --git a/src/dxc/dxc.cpp b/src/dxc/dxc.cpp
deleted file mode 100644
index c0e91bda..00000000
--- a/src/dxc/dxc.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-extern "C"
-{
-#include "dxc.h"
-}
-
-#if PlatformIsWindows
-# include "win32/dxc_win32.cpp"
-#else
-# error Dxc core not implemented for this platform
-#endif
-void DXC_Main(void)
-{
-    RunOnce();
-    DXC_StartupDeps();
-}
diff --git a/src/dxc/dxc.h b/src/dxc/dxc.h
deleted file mode 100644
index aae5d4ec..00000000
--- a/src/dxc/dxc.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef DXC_H
-#define DXC_H
-
-////////////////////////////////
-//~ Layer dependencies
-
-#include "../base/base.h"
-inline void DXC_StartupDeps(void)
-{
-    BaseMain();
-}
-
-////////////////////////////////
-//~ Layer headers
-
-#include "dxc_core.h"
-void DXC_Main(void);
-
-#endif
diff --git a/src/dxc/dxc.lay b/src/dxc/dxc.lay
new file mode 100644
index 00000000..9888ebe2
--- /dev/null
+++ b/src/dxc/dxc.lay
@@ -0,0 +1,14 @@
+@Layer dxc
+
+////////////////////////////////
+//~ Dependencies
+
+@Dep base
+
+////////////////////////////////
+//~ Api
+
+@CpuApi dxc_core
+
+//- Win32
+@CpuApiWindows win32/dxc_win32
diff --git a/src/font/font.c b/src/font/font.c
deleted file mode 100644
index d0ac6048..00000000
--- a/src/font/font.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "font.h"
-
-#include "font_core.c"
-void F_Main(void)
-{
-    RunOnce();
-    F_StartupDeps();
-}
diff --git a/src/font/font.h b/src/font/font.h
deleted file mode 100644
index a4c52111..00000000
--- a/src/font/font.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef FONT_H
-#define FONT_H
-
-////////////////////////////////
-//~ Layer dependencies
-
-#include "../base/base.h"
-#include "../ttf/ttf.h"
-#include "../gpu/gpu.h"
-#include "../resource/resource.h"
-#include "../asset_cache/asset_cache.h"
-inline void F_StartupDeps(void)
-{
-    BaseMain();
-    TTF_Main();
-    GPU_Main();
-    RES_Main();
-    AC_Main();
-}
-
-////////////////////////////////
-//~ Layer headers
-
-#include "font_core.h"
-void F_Main(void);
-
-#endif
diff --git a/src/font/font.lay b/src/font/font.lay
new file mode 100644
index 00000000..9769f9f8
--- /dev/null
+++ b/src/font/font.lay
@@ -0,0 +1,15 @@
+@Layer font
+
+////////////////////////////////
+//~ Dependencies
+
+@Dep base
+@Dep ttf
+@Dep gpu
+@Dep resource
+@Dep asset_cache
+
+////////////////////////////////
+//~ Api
+
+@CpuApi font_core
diff --git a/src/gpu/gpu.c b/src/gpu/gpu.c
deleted file mode 100644
index 0a7b593a..00000000
--- a/src/gpu/gpu.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "gpu.h"
-
-#include "../kernel/kernel.h"
-
-#if PlatformIsWindows
-# include "dx12/gpu_dx12.c"
-#else
-# error Gpu layer not implemented for this platform
-#endif
-void GPU_Main(void)
-{
-    RunOnce();
-    GPU_StartupDeps();
-    GPU_StartupCore();
-}
diff --git a/src/gpu/gpu.h b/src/gpu/gpu.h
deleted file mode 100644
index 5785eb6f..00000000
--- a/src/gpu/gpu.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef GPU_H
-#define GPU_H
-
-////////////////////////////////
-//~ Layer dependencies
-
-#include "../base/base.h"
-#include "../platform/platform.h"
-#include "../tar/tar.h"
-#include "../ase/ase.h"
-#include "../dxc/dxc.h"
-#include "../inc/inc.h"
-#include "../resource/resource.h"
-#include "../watch/watch.h"
-inline void GPU_StartupDeps(void)
-{
-    BaseMain();
-    P_Main();
-    TAR_Main();
-    ASE_Main();
-    DXC_Main();
-    INC_Main();
-    RES_Main();
-    W_Main();
-}
-
-////////////////////////////////
-//~ Layer headers
-
-#include "gpu_core.h"
-#if PlatformIsWindows
-# include "dx12/gpu_dx12.h"
-#endif
-void GPU_Main(void);
-
-#endif
diff --git a/src/gpu/gpu.lay b/src/gpu/gpu.lay
new file mode 100644
index 00000000..f61ff6a1
--- /dev/null
+++ b/src/gpu/gpu.lay
@@ -0,0 +1,26 @@
+@Layer gpu
+
+////////////////////////////////
+//~ Dependencies
+
+@Dep base
+@Dep platform
+@Dep tar
+@Dep ase
+@Dep dxc
+@Dep inc
+@Dep resource
+@Dep watch
+
+////////////////////////////////
+//~ Api
+
+@CpuApi gpu_core
+
+//- Dx12
+@CpuApi dx12/gpu_dx12
+
+////////////////////////////////
+//~ Init
+
+@Init GPU_StartupCore
diff --git a/src/gtest/gtest.c b/src/gtest/gtest.c
deleted file mode 100644
index 179190dc..00000000
--- a/src/gtest/gtest.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "gtest.h"
-
-#if PlatformIsWindows
-# include "dx12/gtest_dx12.c"
-#else
-# error Gpu backend not implemented
-#endif
-void GT_Main(void)
-{
-    RunOnce();
-    GT_StartupDeps();
-    GT_StartupCore();
-}
diff --git a/src/gtest/gtest.h b/src/gtest/gtest.h
deleted file mode 100644
index 5f4c3792..00000000
--- a/src/gtest/gtest.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef GTEST_H
-#define GTEST_H
-
-////////////////////////////////
-//~ Layer dependencies
-
-#include "../base/base.h"
-#include "../platform/platform.h"
-inline void GT_StartupDeps(void)
-{
-    BaseMain();
-    P_Main();
-}
-
-////////////////////////////////
-//~ Layer headers
-
-#include "gtest_core.h"
-#if PlatformIsWindows
-# include "dx12/gtest_dx12.h"
-#endif
-void GT_Main(void);
-
-#endif
diff --git a/src/gtest/gtest.lay b/src/gtest/gtest.lay
new file mode 100644
index 00000000..95391e7e
--- /dev/null
+++ b/src/gtest/gtest.lay
@@ -0,0 +1,20 @@
+@Layer gtest
+
+////////////////////////////////
+//~ Dependencies
+
+@Dep base
+@Dep platform
+
+////////////////////////////////
+//~ Api
+
+@CpuApi gtest_core
+
+//- Dx12
+@CpuApiWindows dx12/gtest_dx12
+
+////////////////////////////////
+//~ Init
+
+@Init GT_StartupCore
diff --git a/src/inc/inc.c b/src/inc/inc.c
deleted file mode 100644
index e86c6f29..00000000
--- a/src/inc/inc.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "inc.h"
-
-#include "inc_core.c"
-void INC_Main(void)
-{
-    RunOnce();
-    INC_StartupDeps();
-}
diff --git a/src/inc/inc.h b/src/inc/inc.h
deleted file mode 100644
index 177b924b..00000000
--- a/src/inc/inc.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef INC_H
-#define INC_H
-
-////////////////////////////////
-//~ Layer dependencies
-
-#include "../base/base.h"
-inline void INC_StartupDeps(void)
-{
-    BaseMain();
-}
-
-////////////////////////////////
-//~ Layer headers
-
-#include "inc_core.h"
-void INC_Main(void);
-
-#endif
diff --git a/src/inc/inc.lay b/src/inc/inc.lay
new file mode 100644
index 00000000..92cd16f2
--- /dev/null
+++ b/src/inc/inc.lay
@@ -0,0 +1,11 @@
+@Layer inc
+
+////////////////////////////////
+//~ Dependencies
+
+@Dep base
+
+////////////////////////////////
+//~ Api
+
+@CpuApi inc_core
diff --git a/src/json/json.c b/src/json/json.c
deleted file mode 100644
index 01b61a5d..00000000
--- a/src/json/json.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "json.h"
-
-#include "json_core.c"
-void JSON_Main(void)
-{
-    RunOnce();
-    JSON_StartupDeps();
-}
diff --git a/src/json/json.h b/src/json/json.h
deleted file mode 100644
index 8ce3cb16..00000000
--- a/src/json/json.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef JSON_H
-#define JSON_H
-
-////////////////////////////////
-//~ Layer dependencies
-
-#include "../base/base.h"
-inline void JSON_StartupDeps(void)
-{
-    BaseMain();
-}
-
-////////////////////////////////
-//~ Layer headers
-
-#include "json_core.h"
-void JSON_Main(void);
-
-#endif
diff --git a/src/json/json.lay b/src/json/json.lay
new file mode 100644
index 00000000..fd59c9f4
--- /dev/null
+++ b/src/json/json.lay
@@ -0,0 +1,11 @@
+@Layer json
+
+////////////////////////////////
+//~ Dependencies
+
+@Dep base
+
+////////////////////////////////
+//~ Api
+
+@CpuApi json_core
diff --git a/src/kernel/kernel.h b/src/kernel/kernel.h
deleted file mode 100644
index 73d205bf..00000000
--- a/src/kernel/kernel.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef KERNEL_H
-#define KERNEL_H
-
-////////////////////////////////
-//~ Layer dependencies
-
-#include "../base/base.h"
-
-////////////////////////////////
-//~ Layer headers
-
-#include "kernel_core.h"
-
-#endif
diff --git a/src/kernel/kernel.lay b/src/kernel/kernel.lay
new file mode 100644
index 00000000..cb71c4ca
--- /dev/null
+++ b/src/kernel/kernel.lay
@@ -0,0 +1,12 @@
+@Layer kernel
+
+////////////////////////////////
+//~ Dependencies
+
+@Dep base
+
+////////////////////////////////
+//~ Api
+
+@CpuApi kernel_core
+@GpuApi kernel_core
diff --git a/src/mixer/mixer.c b/src/mixer/mixer.c
deleted file mode 100644
index f5cc0d0e..00000000
--- a/src/mixer/mixer.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "mixer.h"
-
-#include "mixer_core.c"
-void MIX_Main(void)
-{
-    RunOnce();
-    MIX_StartupDeps();
-    MIX_StartupCore();
-}
diff --git a/src/mixer/mixer.h b/src/mixer/mixer.h
deleted file mode 100644
index 65e1cb18..00000000
--- a/src/mixer/mixer.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef MIXER_H
-#define MIXER_H
-
-////////////////////////////////
-//~ Layer dependencies
-
-#include "../base/base.h"
-#include "../platform/platform.h"
-#include "../sound/sound.h"
-inline void MIX_StartupDeps(void)
-{
-    BaseMain();
-    P_Main();
-    SND_Main();
-}
-
-////////////////////////////////
-//~ Layer headers
-
-#include "mixer_core.h"
-void MIX_Main(void);
-
-#endif
diff --git a/src/mixer/mixer.lay b/src/mixer/mixer.lay
new file mode 100644
index 00000000..7ab35a07
--- /dev/null
+++ b/src/mixer/mixer.lay
@@ -0,0 +1,18 @@
+@Layer mixer
+
+////////////////////////////////
+//~ Dependencies
+
+@Dep base
+@Dep platform
+@Dep sound
+
+////////////////////////////////
+//~ Api
+
+@CpuApi mixer_core
+
+////////////////////////////////
+//~ Init
+
+@Init MIX_StartupCore
diff --git a/src/mp3/mp3.c b/src/mp3/mp3.c
deleted file mode 100644
index 2e8aaf9e..00000000
--- a/src/mp3/mp3.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "mp3.h"
-
-#if PlatformIsWindows
-# include "mmf/mp3_mmf.c"
-#else
-# error Mp3 core not implemented for this platform
-#endif
-void MP3_Main(void)
-{
-    RunOnce();
-    MP3_StartupDeps();
-}
diff --git a/src/mp3/mp3.h b/src/mp3/mp3.h
deleted file mode 100644
index 1bea2dde..00000000
--- a/src/mp3/mp3.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef MP3_H
-#define MP3_H
-
-////////////////////////////////
-//~ Layer dependencies
-
-#include "../base/base.h"
-inline void MP3_StartupDeps(void)
-{
-    BaseMain();
-}
-
-////////////////////////////////
-//~ Layer headers
-
-#include "mp3_core.h"
-void MP3_Main(void);
-
-#endif
diff --git a/src/mp3/mp3.lay b/src/mp3/mp3.lay
new file mode 100644
index 00000000..83b1c2ad
--- /dev/null
+++ b/src/mp3/mp3.lay
@@ -0,0 +1,14 @@
+@Layer mp3
+
+////////////////////////////////
+//~ Dependencies
+
+@Dep base
+
+////////////////////////////////
+//~ Api
+
+@CpuApi mp3_core
+
+//- Mmf
+@CpuApiWindows mp3_mmf
diff --git a/src/net/net.c b/src/net/net.c
deleted file mode 100644
index 8f0ab453..00000000
--- a/src/net/net.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "net.h"
-
-#include "net_core.c"
-void N_Main(void)
-{
-    RunOnce();
-    N_StartupDeps();
-}
diff --git a/src/net/net.h b/src/net/net.h
deleted file mode 100644
index 3b26de49..00000000
--- a/src/net/net.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef NET_H
-#define NET_H
-
-////////////////////////////////
-//~ Layer dependencies
-
-#include "../base/base.h"
-#include "../platform/platform.h"
-#include "../bitbuff/bitbuff.h"
-inline void N_StartupDeps(void)
-{
-    BaseMain();
-    P_Main();
-    BB_Main();
-}
-
-////////////////////////////////
-//~ Layer headers
-
-#include "net_core.h"
-void N_Main(void);
-
-#endif
diff --git a/src/net/net.lay b/src/net/net.lay
new file mode 100644
index 00000000..f2499a3c
--- /dev/null
+++ b/src/net/net.lay
@@ -0,0 +1,13 @@
+@Layer net
+
+////////////////////////////////
+//~ Dependencies
+
+@Dep base
+@Dep platform
+@Dep bitbuff
+
+////////////////////////////////
+//~ Api
+
+@CpuApi net_core
diff --git a/src/platform/platform.c b/src/platform/platform.c
deleted file mode 100644
index 185975ec..00000000
--- a/src/platform/platform.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "platform.h"
-
-#include "platform_log.c"
-
-#if PlatformIsWindows
-# include "platform_win32.c"
-#else
-# error Platform core not implemented
-#endif
-void P_Main(void)
-{
-    RunOnce();
-    P_StartupDeps();
-    P_StartupCore();
-    /* FIXME: Logfile path */
-    P_StartupLog(Lit("log.log"));
-}
diff --git a/src/platform/platform.h b/src/platform/platform.h
deleted file mode 100644
index 31d39c18..00000000
--- a/src/platform/platform.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef PLATFORM_H
-#define PLATFORM_H
-
-////////////////////////////////
-//~ Layer dependencies
-
-#include "../base/base.h"
-inline void P_StartupDeps(void)
-{
-    BaseMain();
-}
-
-////////////////////////////////
-//~ Layer headers
-
-#include "platform_core.h"
-#include "platform_log.h"
-#if PlatformIsWindows
-# include "platform_win32.h"
-#endif
-void P_Main(void);
-
-#endif
diff --git a/src/platform/platform.lay b/src/platform/platform.lay
new file mode 100644
index 00000000..1f7d6a7c
--- /dev/null
+++ b/src/platform/platform.lay
@@ -0,0 +1,21 @@
+@Layer platform
+
+////////////////////////////////
+//~ Dependencies
+
+@Dep base
+
+////////////////////////////////
+//~ Api
+
+@CpuApi platform_core
+@CpuApi platform_log
+
+//- Win32
+@CpuApiWindows platform_win32
+
+////////////////////////////////
+//~ Init
+
+@Init P_StartupCore
+@Init P_StartupLog
diff --git a/src/playback/playback.c b/src/playback/playback.c
deleted file mode 100644
index 85426918..00000000
--- a/src/playback/playback.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "playback.h"
-
-#if PlatformIsWindows
-# include "win32/playback_win32.c"
-#else
-# error Playback core not implemented for this platform
-#endif
-void PB_Main(void)
-{
-    RunOnce();
-    PB_StartupDeps();
-    PB_StartupCore();
-}
diff --git a/src/playback/playback.h b/src/playback/playback.h
deleted file mode 100644
index 2d9441b7..00000000
--- a/src/playback/playback.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef PLAYBACK_H
-#define PLAYBACK_H
-
-////////////////////////////////
-//~ Layer dependencies
-
-#include "../base/base.h"
-#include "../platform/platform.h"
-#include "../mixer/mixer.h"
-inline void PB_StartupDeps(void)
-{
-    BaseMain();
-    P_Main();
-    MIX_Main();
-}
-
-////////////////////////////////
-//~ Layer headers
-
-#include "playback_core.h"
-#if PlatformIsWindows
-# include "win32/playback_win32.h"
-#endif
-void PB_Main(void);
-
-#endif
diff --git a/src/playback/playback.lay b/src/playback/playback.lay
new file mode 100644
index 00000000..74ede6e7
--- /dev/null
+++ b/src/playback/playback.lay
@@ -0,0 +1,21 @@
+@Layer playback
+
+////////////////////////////////
+//~ Dependencies
+
+@Dep base
+@Dep platform
+@Dep mixer
+
+////////////////////////////////
+//~ Api
+
+@CpuApi playback_core
+
+//- Wasapi
+@CpuApiWindows wasapi/playback_wasapi
+
+////////////////////////////////
+//~ Init
+
+@Init PB_StartupCore
diff --git a/src/playback/win32/playback_win32.c b/src/playback/wasapi/playback_wasapi.c
similarity index 100%
rename from src/playback/win32/playback_win32.c
rename to src/playback/wasapi/playback_wasapi.c
diff --git a/src/playback/win32/playback_win32.h b/src/playback/wasapi/playback_wasapi.h
similarity index 100%
rename from src/playback/win32/playback_win32.h
rename to src/playback/wasapi/playback_wasapi.h
diff --git a/src/pp/pp.c b/src/pp/pp.c
deleted file mode 100644
index 8e807f69..00000000
--- a/src/pp/pp.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "pp.h"
-
-#include "pp_ent.c"
-#include "pp_phys.c"
-#include "pp_step.c"
-#include "pp_space.c"
-#include "pp_sim.c"
-#include "pp_core.c"
-void PpMain(void)
-{
-    RunOnce();
-    StartupPpDeps();
-    StartupSim();
-    StartupUser();
-}
diff --git a/src/pp/pp.h b/src/pp/pp.h
deleted file mode 100644
index a53f2cd6..00000000
--- a/src/pp/pp.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef PP_H
-#define PP_H
-
-////////////////////////////////
-//~ Layer dependencies
-
-#include "../base/base.h"
-#include "../gtest/gtest.h"
-#include "../sprite/sprite.h"
-#include "../font/font.h"
-#include "../collider/collider.h"
-#include "../draw/draw.h"
-#include "../net/net.h"
-#include "../mixer/mixer.h"
-#include "../bitbuff/bitbuff.h"
-#include "../rendertest/rendertest.h"
-inline void StartupPpDeps(void)
-{
-    BaseMain();
-    GT_Main();
-    S_Main();
-    F_Main();
-    CLD_Main();
-    D_Main();
-    N_Main();
-    MIX_Main();
-    BB_Main();
-    RT_Main();
-}
-
-////////////////////////////////
-//~ Layer headers
-
-#include "pp_sim.h"
-#include "pp_phys.h"
-#include "pp_space.h"
-#include "pp_ent.h"
-#include "pp_step.h"
-#include "pp_draw.h"
-#include "pp_core.h"
-void PpMain(void);
-
-#endif
diff --git a/src/pp/pp.lay b/src/pp/pp.lay
new file mode 100644
index 00000000..4fdf8c62
--- /dev/null
+++ b/src/pp/pp.lay
@@ -0,0 +1,32 @@
+@Layer pp
+
+////////////////////////////////
+//~ Dependencies
+
+@Dep base
+@Dep gtest
+@Dep sprite
+@Dep font
+@Dep collider
+@Dep draw
+@Dep net
+@Dep mixer
+@Dep bitbuff
+@Dep rendertest
+
+////////////////////////////////
+//~ Api
+
+@CpuApi pp_sim
+@CpuApi pp_phys
+@CpuApi pp_space
+@CpuApi pp_ent
+@CpuApi pp_step
+@CpuApi pp_draw
+@CpuApi pp_core
+
+////////////////////////////////
+//~ Init
+
+@Init StartupSim
+@Init StartupUser
diff --git a/src/prof/prof.cpp b/src/prof/prof.cpp
deleted file mode 100644
index c6046828..00000000
--- a/src/prof/prof.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "prof.h"
-
-#include "prof_tracy.cpp"
diff --git a/src/prof/prof.h b/src/prof/prof.h
deleted file mode 100644
index f891c984..00000000
--- a/src/prof/prof.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef PROF_H
-#define PROF_H
-
-#include "prof_tracy.h"
-
-#endif
diff --git a/src/prof/prof.lay b/src/prof/prof.lay
new file mode 100644
index 00000000..22a5d8cc
--- /dev/null
+++ b/src/prof/prof.lay
@@ -0,0 +1,6 @@
+@Lay prof
+
+////////////////////////////////
+//~ Api
+
+@CpuApi prof_tracy
diff --git a/src/rendertest/rendertest.c b/src/rendertest/rendertest.c
deleted file mode 100644
index 809d37b9..00000000
--- a/src/rendertest/rendertest.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "rendertest.h"
-
-#include "rendertest_core.c"
-void RT_Main(void)
-{
-    RunOnce();
-    RT_StartupDeps();
-    RT_StartupCore();
-}
diff --git a/src/rendertest/rendertest.h b/src/rendertest/rendertest.h
deleted file mode 100644
index 54dfc5ed..00000000
--- a/src/rendertest/rendertest.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef RENDERTEST_H
-#define RENDERTEST_H
-
-////////////////////////////////
-//~ Layer dependencies
-
-#include "../base/base.h"
-#include "../gpu/gpu.h"
-#include "../sprite/sprite.h"
-#include "../font/font.h"
-#include "../collider/collider.h"
-inline void RT_StartupDeps(void)
-{
-    BaseMain();
-    GPU_Main();
-    S_Main();
-    F_Main();
-    CLD_Main();
-}
-
-////////////////////////////////
-//~ Layer headers
-
-#include "rendertest_core.h"
-void RT_Main(void);
-
-#endif
diff --git a/src/rendertest/rendertest.lay b/src/rendertest/rendertest.lay
new file mode 100644
index 00000000..de855edc
--- /dev/null
+++ b/src/rendertest/rendertest.lay
@@ -0,0 +1,20 @@
+@Layer rendertest
+
+////////////////////////////////
+//~ Dependencies
+
+@Dep base
+@Dep gpu
+@Dep sprite
+@Dep font
+@Dep collider
+
+////////////////////////////////
+//~ Api
+
+@CpuApi rendertest_core
+
+////////////////////////////////
+//~ Init
+
+@Init RT_StartupCore
diff --git a/src/resource/resource.c b/src/resource/resource.c
deleted file mode 100644
index 89308560..00000000
--- a/src/resource/resource.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "resource.h"
-
-#include "resource_core.c"
-void RES_Main(void)
-{
-    RunOnce();
-    RES_StartupDeps();
-    RES_StartupCore();
-}
diff --git a/src/resource/resource.h b/src/resource/resource.h
deleted file mode 100644
index 26401b13..00000000
--- a/src/resource/resource.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef RESOURCE_H
-#define RESOURCE_H
-
-////////////////////////////////
-//~ Layer dependencies
-
-#include "../base/base.h"
-#include "../platform/platform.h"
-#include "../tar/tar.h"
-#if RESOURCES_EMBEDDED
-# include "../inc/inc.h"
-#endif
-inline void RES_StartupDeps(void)
-{
-    BaseMain();
-    P_Main();
-    TAR_Main();
-#if RESOURCES_EMBEDDED
-    INC_Main();
-#endif
-}
-
-////////////////////////////////
-//~ Layer headers
-
-#include "resource_core.h"
-void RES_Main(void);
-
-#endif
diff --git a/src/resource/resource.lay b/src/resource/resource.lay
new file mode 100644
index 00000000..824ccbca
--- /dev/null
+++ b/src/resource/resource.lay
@@ -0,0 +1,19 @@
+@Layer resource
+
+////////////////////////////////
+//~ Dependencies
+
+@Dep base
+@Dep platform
+@Dep tar
+@Dep inc
+
+////////////////////////////////
+//~ Api
+
+@CpuApi resource_core
+
+////////////////////////////////
+//~ Init
+
+@Init RES_StartupCore
diff --git a/src/settings/settings.c b/src/settings/settings.c
deleted file mode 100644
index 23aa4d85..00000000
--- a/src/settings/settings.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "settings.h"
-
-#include "settings_core.c"
-void SETTINGS_Main(void)
-{
-    RunOnce();
-    SETTINGS_StartupDeps();
-}
diff --git a/src/settings/settings.h b/src/settings/settings.h
deleted file mode 100644
index 238d927b..00000000
--- a/src/settings/settings.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef SETTINGS_H
-#define SETTINGS_H
-
-////////////////////////////////
-//~ Layer dependencies
-
-#include "../base/base.h"
-#include "../platform/platform.h"
-#include "../json/json.h"
-inline void SETTINGS_StartupDeps(void)
-{
-    BaseMain();
-    P_Main();
-    JSON_Main();
-}
-
-////////////////////////////////
-//~ Layer headers
-
-#include "settings_core.h"
-void SETTINGS_Main(void);
-
-#endif
diff --git a/src/settings/settings.lay b/src/settings/settings.lay
new file mode 100644
index 00000000..af082770
--- /dev/null
+++ b/src/settings/settings.lay
@@ -0,0 +1,13 @@
+@Layer settings
+
+////////////////////////////////
+//~ Dependencies
+
+@Dep base
+@Dep platform
+@Dep json
+
+////////////////////////////////
+//~ Api
+
+@CpuApi settings_core
diff --git a/src/sound/sound.c b/src/sound/sound.c
deleted file mode 100644
index 2c7bec52..00000000
--- a/src/sound/sound.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "sound.h"
-
-#include "sound_core.c"
-void SND_Main(void)
-{
-    RunOnce();
-    SND_StartupDeps();
-}
diff --git a/src/sound/sound.h b/src/sound/sound.h
deleted file mode 100644
index 8df5458f..00000000
--- a/src/sound/sound.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef SOUND_H
-#define SOUND_H
-
-////////////////////////////////
-//~ Layer dependencies
-
-#include "../base/base.h"
-#include "../platform/platform.h"
-#include "../mp3/mp3.h"
-#include "../resource/resource.h"
-#include "../asset_cache/asset_cache.h"
-inline void SND_StartupDeps(void)
-{
-    BaseMain();
-    P_Main();
-    MP3_Main();
-    RES_Main();
-    AC_Main();
-}
-
-////////////////////////////////
-//~ Layer headers
-
-#include "sound_core.h"
-void SND_Main(void);
-
-#endif
diff --git a/src/sound/sound.lay b/src/sound/sound.lay
new file mode 100644
index 00000000..b09ca398
--- /dev/null
+++ b/src/sound/sound.lay
@@ -0,0 +1,15 @@
+@Layer sound
+
+////////////////////////////////
+//~ Dependencies
+
+@Dep base
+@Dep platform
+@Dep mp3
+@Dep resource
+@Dep asset_cache
+
+////////////////////////////////
+//~ Api
+
+@CpuApi sound_core
diff --git a/src/sprite/sprite.c b/src/sprite/sprite.c
deleted file mode 100644
index 139f8114..00000000
--- a/src/sprite/sprite.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "sprite.h"
-
-#include "sprite_core.c"
-void S_Main(void)
-{
-    RunOnce();
-    S_StartupDeps();
-    S_StartupCore();
-}
diff --git a/src/sprite/sprite.h b/src/sprite/sprite.h
deleted file mode 100644
index f7a455f0..00000000
--- a/src/sprite/sprite.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef SPRITE_H
-#define SPRITE_H
-
-////////////////////////////////
-//~ Layer dependencies
-
-#include "../base/base.h"
-#include "../platform/platform.h"
-#include "../gtest/gtest.h"
-#include "../ase/ase.h"
-#include "../resource/resource.h"
-#include "../watch/watch.h"
-inline void S_StartupDeps(void)
-{
-    BaseMain();
-    P_Main();
-    GT_Main();
-    ASE_Main();
-    RES_Main();
-    W_Main();
-}
-
-////////////////////////////////
-//~ Layer headers
-
-#include "sprite_core.h"
-void S_Main(void);
-
-#endif
diff --git a/src/sprite/sprite.lay b/src/sprite/sprite.lay
new file mode 100644
index 00000000..87f6d91e
--- /dev/null
+++ b/src/sprite/sprite.lay
@@ -0,0 +1,21 @@
+@Layer sprite
+
+////////////////////////////////
+//~ Dependencies
+
+@Dep base
+@Dep platform
+@Dep gtest
+@Dep ase
+@Dep resource
+@Dep watch
+
+////////////////////////////////
+//~ Api
+
+@CpuApi sprite_core
+
+////////////////////////////////
+//~ Init
+
+@Init S_StartupCore
diff --git a/src/tar/tar.c b/src/tar/tar.c
deleted file mode 100644
index d9a85d04..00000000
--- a/src/tar/tar.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "tar.h"
-
-#include "tar_core.c"
-void TAR_Main(void)
-{
-    RunOnce();
-    TAR_StartupDeps();
-}
diff --git a/src/tar/tar.h b/src/tar/tar.h
deleted file mode 100644
index 26eb04b8..00000000
--- a/src/tar/tar.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef TAR_H
-#define TAR_H
-
-////////////////////////////////
-//~ Layer dependencies
-
-#include "../base/base.h"
-#include "../platform/platform.h"
-#include "../bitbuff/bitbuff.h"
-inline void TAR_StartupDeps(void)
-{
-    BaseMain();
-    P_Main();
-    BB_Main();
-}
-
-////////////////////////////////
-//~ Layer headers
-
-#include "tar_core.h"
-void TAR_Main(void);
-
-#endif
diff --git a/src/tar/tar.lay b/src/tar/tar.lay
new file mode 100644
index 00000000..5635b713
--- /dev/null
+++ b/src/tar/tar.lay
@@ -0,0 +1,13 @@
+@Layer tar
+
+////////////////////////////////
+//~ Dependencies
+
+@Dep base
+@Dep platform
+@Dep bitbuff
+
+////////////////////////////////
+//~ Api
+
+@CpuApi tar_core
diff --git a/src/ttf/ttf.cpp b/src/ttf/ttf.cpp
deleted file mode 100644
index bcc33083..00000000
--- a/src/ttf/ttf.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-extern "C"
-{
-#include "ttf.h"
-}
-
-#if PlatformIsWindows
-# include "dwrite/ttf_dwrite.cpp"
-#else
-# error TTF not implemented for this platform
-#endif
-void TTF_Main(void)
-{
-    RunOnce();
-    TTF_StartupDeps();
-    TTF_StartupCore();
-}
diff --git a/src/ttf/ttf.h b/src/ttf/ttf.h
deleted file mode 100644
index 27fe12ac..00000000
--- a/src/ttf/ttf.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef TTF_H
-#define TTF_H
-
-////////////////////////////////
-//~ Layer dependencies
-
-#include "../base/base.h"
-inline void TTF_StartupDeps(void)
-{
-    BaseMain();
-}
-
-////////////////////////////////
-//~ Layer headers
-
-#include "ttf_core.h"
-#if PlatformIsWindows
-# include "dwrite/ttf_dwrite.h"
-#endif
-void TTF_Main(void);
-
-#endif
diff --git a/src/ttf/ttf.lay b/src/ttf/ttf.lay
new file mode 100644
index 00000000..c6fd4e76
--- /dev/null
+++ b/src/ttf/ttf.lay
@@ -0,0 +1,41 @@
+////////////////////////////////
+//~ Dependencies
+
+AddDep("../base/base.h");
+AddDep("../gtest/gtest.h");
+AddDep("../sprite/sprite.h");
+AddDep("../font/font.h");
+AddDep("../collider/collider.h");
+AddDep("../draw/draw.h");
+AddDep("../net/net.h");
+AddDep("../mixer/mixer.h");
+AddDep("../bitbuff/bitbuff.h");
+AddDep("../rendertest/rendertest.h");
+
+////////////////////////////////
+//~ Headers
+
+AddHeader("pp_sim.h");
+AddHeader("pp_phys.h");
+AddHeader("pp_space.h");
+AddHeader("pp_ent.h");
+AddHeader("pp_step.h");
+AddHeader("pp_draw.h");
+AddHeader("pp_core.h");
+
+////////////////////////////////
+//~ Sources
+
+AddCSource("pp_ent.c");
+AddCSource("pp_phys.c");
+AddCSource("pp_step.c");
+AddCSource("pp_space.c");
+AddCSource("pp_sim.c");
+AddCSource("pp_core.c");
+
+////////////////////////////////
+//~ Init
+
+AddInit(StartupPpDeps);
+AddInit(StartupSim);
+AddInit(StartupUser);
diff --git a/src/watch/watch.c b/src/watch/watch.c
deleted file mode 100644
index ac00f629..00000000
--- a/src/watch/watch.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "watch.h"
-
-#include "watch_core.c"
-void W_Main(void)
-{
-    RunOnce();
-    W_StartupDeps();
-    W_StartupCore();
-}
diff --git a/src/watch/watch.h b/src/watch/watch.h
deleted file mode 100644
index b9367c76..00000000
--- a/src/watch/watch.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef WATCH_H
-#define WATCH_H
-
-////////////////////////////////
-//~ Layer dependencies
-
-#include "../base/base.h"
-#include "../platform/platform.h"
-inline void W_StartupDeps(void)
-{
-    BaseMain();
-    P_Main();
-}
-
-////////////////////////////////
-//~ Layer headers
-
-#include "watch_core.h"
-void W_Main(void);
-
-#endif
diff --git a/src/watch/watch.lay b/src/watch/watch.lay
new file mode 100644
index 00000000..18a7fab4
--- /dev/null
+++ b/src/watch/watch.lay
@@ -0,0 +1,17 @@
+@Layer watch
+
+////////////////////////////////
+//~ Dependencies
+
+@Dep base
+@Dep platform
+
+////////////////////////////////
+//~ Api
+
+@CpuApi watch_core
+
+////////////////////////////////
+//~ Init
+
+@Init W_StartupCore