Removed DPS-Layout & Moved Heal-Layout into the core