consolidating our folders