Change to newer format bax, move resources