Merged in src files for partisynth