more resolvePlot, switched folder structure