proper restructuration for tmbundle