restructuring with new framework folder