delete gravedigger class
Switch architecture components
Reverted to previous features, but component archi