MOBILE-1208, new folder structures.