Add model.di and remove target directory