d2 overhaul:  .adds,.removes. .mk

Signed-off-by: ayysir <dresadd09691@gmail.com>