now uses subfolders for partials
fixed merge