Reorganization of "Core"
(Commit by Akred)