Restructure for app folder usage.