Added markup to separate the core modules