Move 'class' folder into library
Move 'class' folder into library