Moving base sources to psf-def