Revised sub-architectures of core package