move locking to new file