Added classlib and unit test