Revert "lib moved under classes"

This reverts commit 3650a190570b891b92a92b278d2c65025be3f2c1.
Revert "Revert "lib moved under classes""

This reverts commit 161cf84fa988786c4d6fa62c102cf22541700cba.