Restructure with folders