fixed merge conflicts finally, now places partials files in seperate directories