Test folder restructure