New folder structure. Plus apps.