x-tier: moved main data structure definitions to kernel