add custom blocks, remove module folder (inherits)