Restructued folders for two apps