LOK: Split into instance and class.

Change-Id: I2b6f33eaf12343c7da1328a932eb703bb4e4ef6f