Finally... no more layouts/v2 folder.