Moving library classes to the separate module