Restructure app folder