Change subdir to type in sandbox-core.make