Fix merge error

js files were moved/split, but timeline plugin merge brought references
to the old files back.