Minor cleanup

Minor cleanup and moving CalcParser and StringDate to the psdata package within psdatalib.