Adapted to Move of Classes to psdata

Adapted to move of CalcParser and StringDate classes to psdata package