Move lock class to namespacing, rm unused class