renamed to get rid of class in names (should just be in the files)
Added locks
Imports were wrong because of file name change. Fixed