Core: decoupled modules from Core wherever possible.
Core: fixed issues with inaccurate comments in Core modules.