Separated Calc and calcLib to different classes