Move locals to their own file