Move lock to own package, rlock. Can use in many applications. Easier to maintains.