switched to separate source+target files until severe bugs are resolved