Added modular core files